Changeset 9379

Timestamp:

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

Author:

ryan

Message:

get_page_of_comment() fixes from Viper007Bond. see #7956

File:

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

trunk/wp-includes/comment.php

@@ -195 +195 @@
         $approved = "( comment_approved = '0' OR comment_approved = '1' )";
 
-    if ( 'ASC' != $order )
-        $order = 'DESC';
+    $order = ( 'ASC' == $order ) ? 'ASC' : 'DESC';
 
     $orderby = 'comment_date_gmt';  // Hard code for now
@@ -485 +484 @@
  *
  * @since 2.7.0
+ * @uses get_query_var() Used to fill in the default for $per_page parameter.
+ * @uses get_option() Used to fill in defaults for parameters.
+ * @uses Walker_Comment
  *
  * @param array $comments Optional array of comment objects.  Defaults to $wp_query->comments
@@ -524 +526 @@
  *
  * @since 2.7.0
+ * @uses get_comment() Gets the full comment of the $comment_ID parameter.
+ * @uses get_option() Get various settings to control function and defaults.
+ * @uses get_page_of_comment() Used to loop up to top level comment.
  *
  * @param int $comment_ID Comment ID.
@@ -530 +535 @@
  */
 function get_page_of_comment( $comment_ID, $per_page = null, $threaded = null ) {
-    $comment = get_comment( $comment_ID );
-
-    if ( !$comment || 1 != $comment->comment_approved )
+    if ( !$comment = get_comment( $comment_ID ) )
         return;
 
@@ -538 +541 @@
         return 1;
 
-    $comments = array_reverse( get_comments( array( 'post_id' => $comment->comment_post_ID ) ) );
-
     if ( null === $per_page )
         $per_page = get_option('comments_per_page');
@@ -547 +548 @@
 
     // 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;
-        }
-    }
+    if ( $threaded && 0 != $comment->comment_parent )
+        return get_page_of_comment( $comment->comment_parent, $per_page, $threaded );
+
+    $comments = get_comments( array( 'post_id' => $comment->comment_post_ID, 'order' => 'ASC' ) );
 
     // Start going through the comments until we find what page number the above top level comment is on