Ticket #7956: 7956_while_fix.patch

wp-includes/comment.php

@@ -529 +529 @@
  * @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 ) )
+        $comment = get_comment( $comment_ID );
+
+        if ( !$comment || 1 != $comment->comment_approved )
                 return;
 
         if ( !get_option('page_comments') )
@@ -543 +545 @@
         if ( null === $threaded )
                 $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;
+                }
         }
 
         // Start going through the comments until we find what page number the above top level comment is on