Changeset 9377

Timestamp:

10/28/2008 07:17:29 AM (16 years ago)

Author:

ryan

Message:

get_page_of_comment() fixes from Viper007Bond. see #7956

File:

• trunk/wp-includes/comment.php (modified) (3 diffs)

trunk/wp-includes/comment.php

@@ -530 +530 @@
  */
 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;
 
@@ -536 +538 @@
         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 )
@@ -544 +546 @@
         $threaded = get_option('thread_comments');
 
-    // Find this comment's top level parent
-    if ( $threaded ) {
-        while ( 0 != $comment->comment_parent )
+    // Find this comment's top level parent if threading is enabled
+    if ( $threaded && 0 != $comment->comment_parent ) {
+        while ( 0 != $comment->comment_parent ) {
             $comment = get_comment( $comment->comment_parent );
+            if ( !$comment || 1 != $comment->comment_approved )
+                return;
+        }
     }