Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 17:48:01 +01:00
Code Issues Projects Releases Wiki Activity

get_page_of_comment() fixes from Viper007Bond. see #7956

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@9377 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-10-28 07:17:29 +00:00
parent acfecce577
commit 8d76dc5af1
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wp-includes/comment.php
View File

@ -529,13 +529,15 @@ function get_comment_pages_count( $comments = null, $per_page = null, $threaded
* @return int|null Comment page number or null on error. * @return int|null Comment page number or null on error.
*/ */
function get_page_of_comment( $comment_ID, $per_page = null, $threaded = null ) { function get_page_of_comment( $comment_ID, $per_page = null, $threaded = null ) {
if ( !$comment = get_comment( $comment_ID ) ) $comment = get_comment( $comment_ID );
if ( !$comment || 1 != $comment->comment_approved )
return; return;
if ( !get_option('page_comments') ) if ( !get_option('page_comments') )
return 1; return 1;
$comments = array_reverse( get_comments( $comment->comment_post_ID ) ); $comments = array_reverse( get_comments( array( 'post_id' => $comment->comment_post_ID ) ) );
if ( null === $per_page ) if ( null === $per_page )
$per_page = get_option('comments_per_page'); $per_page = get_option('comments_per_page');
@ -543,10 +545,13 @@ function get_page_of_comment( $comment_ID, $per_page = null, $threaded = null )
if ( null === $threaded ) if ( null === $threaded )
$threaded = get_option('thread_comments'); $threaded = get_option('thread_comments');
// Find this comment's top level parent // Find this comment's top level parent if threading is enabled
if ( $threaded ) { if ( $threaded && 0 != $comment->comment_parent ) {
while ( 0 != $comment->comment_parent ) while ( 0 != $comment->comment_parent ) {
$comment = get_comment( $comment->comment_parent ); $comment = get_comment( $comment->comment_parent );
if ( !$comment || 1 != $comment->comment_approved )
return;
}
} }
// Start going through the comments until we find what page number the above top level comment is on // Start going through the comments until we find what page number the above top level comment is on