Changeset 9296 for trunk/wp-includes/comment-template.php

Timestamp:

10/23/2008 04:08:47 PM (16 years ago)

Author:

ryan

Message:

Comment paging and sorting from Viper007Bond. see #7927

File:

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

trunk/wp-includes/comment-template.php

@@ -762 +762 @@
         $comments_by_type = &$wp_query->comments_by_type;
     }
+
+    if ( '' == get_query_var('cpage') && get_option('page_comments') && 'newest' == get_option('default_comments_page') ) 
+        set_query_var( 'cpage', get_comment_pages_count() );
 
     define('COMMENTS_TEMPLATE', true);
@@ -1123 +1126 @@
  * @uses Walker_Comment
  *
- * @param $args string|array Formatting options
- * @param $comments array Optional array of comment objects.  Defaults to $wp_query->comments
+ * @param string|array $args Formatting options
+ * @param array $comments Optional array of comment objects.  Defaults to $wp_query->comments
  */
 function wp_list_comments($args = array(), $comments = null ) {
@@ -1133 +1136 @@
 
     $defaults = array('walker' => null, 'depth' => '', 'style' => 'ul', 'callback' => null, 'end-callback' => null, 'type' => 'all',
-        'page' => get_query_var('cpage'), 'per_page' => '', 'avatar_size' => 32);
+        'page' => '', 'per_page' => '', 'avatar_size' => 32, 'reverse_top_level' => '', 'reverse_children' => '');
 
     $r = wp_parse_args( $args, $defaults );
@@ -1143 +1146 @@
         $r['per_page'] = 0;
         $r['page'] = 0;
-    } else {
-        $r['page'] = intval($r['page']);
-        if ( empty($r['page']) )
-            $r['page'] = 1;
     }
 
@@ -1155 +1154 @@
             $r['depth'] = -1;
     }
+
+    if ( '' === $r['page'] ) {
+        if ( empty($comments) ) {
+            $r['page'] = get_query_var('cpage');
+        } else {
+            $threaded = ( -1 == $r['depth'] ) ? false : true;
+            $r['page'] = ( 'newest' == get_option('default_comments_page') ) ? get_comment_pages_count($comments, $r['per_page'], $threaded) : 1;
+            set_query_var( 'cpage', $r['page'] );
+        }
+    }
+    // Validation check
+    $r['page'] = intval($r['page']);
+    if ( 0 == $r['page'] && 0 != $r['per_page'] )
+        $r['page'] = 1;
+
+    if ( '' == $r['reverse_top_level'] )
+        $r['reverse_top_level'] = ( 'asc' == get_option('comment_order') ) ? FALSE : TRUE;
 
     extract( $r, EXTR_SKIP );