WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make get_comment_link() paging aware. Props Viper007Bond. see #7956 

git-svn-id: http://svn.automattic.com/wordpress/trunk@9367 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-10-27 16:31:26 +00:00
parent 611bbf9955
commit 53220e2a0e
3 changed files with 67 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/canonical.php
View File

@ -249,20 +249,20 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
if ( $compare_original !== $compare_redirect ) {
$redirect_url = $redirect['scheme'] . '://' . $redirect['host'];
if ( !empty($redirect['port']) )
$redirect_url .= ':' . $redirect['port'];
$redirect_url .= ':' . $redirect['port'];
$redirect_url .= $redirect['path'];
if ( !empty($redirect['query']) )
$redirect_url .= '?' . $redirect['query'];
}
if ( !$redirect_url || $redirect_url == $requested_url )
return false;
return false;
// Note that you can use the "redirect_canonical" filter to cancel a canonical redirect for whatever reason by returning FALSE
$redirect_url = apply_filters('redirect_canonical', $redirect_url, $requested_url);
if ( !$redirect_url || $redirect_url == $requested_url ) // yes, again -- in case the filter aborted the request
return false;
return false;
if ( $do_redirect ) {
// protect against chained redirects

18
wp-includes/comment-template.php
View File

@ -402,7 +402,7 @@ function comment_ID() {
}
/**
* Retrieve the link to the current comment.
* Retrieve the link to a given comment.
*
* @since 1.5.0
* @uses $comment
@ -411,8 +411,20 @@ function comment_ID() {
* @return string The permalink to the current comment
*/
function get_comment_link($comment = null) {
global $wp_rewrite;
$comment = get_comment($comment);
return get_permalink( $comment->comment_post_ID ) . '#comment-' . $comment->comment_ID;
if ( get_option('page_comments') ) {
$page = get_page_of_comment( $comment->comment_ID );
if ( $wp_rewrite->using_permalinks() )
return user_trailingslashit( trailingslashit( get_permalink( $comment->comment_post_ID ) ) . "comment-page-$page", 'comment' ) . '#comment-' . $comment->comment_ID;
else
return add_query_arg( 'cpage', $page, get_permalink( $comment->comment_post_ID ) ) . '#comment-' . $comment->comment_ID;
} else {
return get_permalink( $comment->comment_post_ID ) . '#comment-' . $comment->comment_ID;
}
}
/**
@ -1085,7 +1097,7 @@ class Walker_Comment extends Walker {
<br />
<?php endif; ?>
<div class="comment-meta commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php printf(__('%1$s at %2$s'), get_comment_date('F jS, Y'), get_comment_time()) ?></a><?php edit_comment_link('edit','&nbsp;&nbsp;','') ?></div>
<div class="comment-meta commentmetadata"><a href="<?php echo htmlspecialchars( get_comment_link( $comment->comment_ID ) ) ?>"><?php printf(__('%1$s at %2$s'), get_comment_date('F jS, Y'), get_comment_time()) ?></a><?php edit_comment_link('edit','&nbsp;&nbsp;','') ?></div>
<?php echo apply_filters('comment_text', get_comment_text()) ?>

49
wp-includes/comment.php
View File

@ -519,6 +519,55 @@ function get_comment_pages_count( $comments = null, $per_page = null, $threaded
return $count;
}
/**
* Calculate what page number a comment will appear on for comment paging.
*
* @since 2.7.0
*
* @param int $comment_ID Comment ID.
* @param int $per_page Optional comments per page.
* @return int|null Comment page number or null on error.
*/
function get_page_of_comment( $comment_ID, $per_page = null, $threaded = null ) {
if ( !$comment = get_comment( $comment_ID ) )
return;
if ( !get_option('page_comments') )
return 1;
$comments = array_reverse( get_comments( $comment->comment_post_ID ) );
if ( null === $per_page )
$per_page = get_option('comments_per_page');
if ( null === $threaded )
$threaded = get_option('thread_comments');
// Find this comment's top level parent
if ( $threaded ) {
while ( 0 != $comment->comment_parent )
$comment = get_comment( $comment->comment_parent );
}
// Start going through the comments until we find what page number the above top level comment is on
$page = 1;
$comthispage = 0;
foreach ( $comments as $com ) {
if ( $threaded && 0 != $com->comment_parent )
continue;
if ( $com->comment_ID == $comment->comment_ID )
return $page;
$comthispage++;
if ( $comthispage >= $per_page ) {
$page++;
$comthispage = 0;
}
}
}
/**
* Does comment contain blacklisted characters or words.
*