Index: /trunk/wp-includes/comment-template.php
===================================================================
--- /trunk/wp-includes/comment-template.php (revision 9423)
+++ /trunk/wp-includes/comment-template.php (revision 9424)
@@ -1130,5 +1130,5 @@
- $add_below, 'depth' => $depth, 'max_depth' => $args['depth']))) ?>
+ $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth']))) ?>
@@ -1177,5 +1177,5 @@
$comment_depth = 1;
- $defaults = array('walker' => null, 'depth' => '', 'style' => 'ul', 'callback' => null, 'end-callback' => null, 'type' => 'all',
+ $defaults = array('walker' => null, 'max_depth' => '', 'style' => 'ul', 'callback' => null, 'end-callback' => null, 'type' => 'all',
'page' => '', 'per_page' => '', 'avatar_size' => 32, 'reverse_top_level' => null, 'reverse_children' => '');
@@ -1190,9 +1190,9 @@
}
- if ( '' === $r['depth'] ) {
+ if ( '' === $r['max_depth'] ) {
if ( get_option('thread_comments') )
- $r['depth'] = get_option('thread_comments_depth');
+ $r['max_depth'] = get_option('thread_comments_depth');
else
- $r['depth'] = -1;
+ $r['max_depth'] = -1;
}
@@ -1204,5 +1204,5 @@
$r['page'] = get_query_var('cpage');
} else {
- $threaded = ( -1 == $r['depth'] ) ? false : true;
+ $threaded = ( -1 == $r['max_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'] );
@@ -1231,9 +1231,9 @@
if ( empty($wp_query->comments_by_type[$type]) )
return;
- $walker->paged_walk($wp_query->comments_by_type[$type], $depth, $page, $per_page, $r);
+ $walker->paged_walk($wp_query->comments_by_type[$type], $max_depth, $page, $per_page, $r);
$wp_query->max_num_comment_pages = $walker->max_pages;
return;
}
- $walker->paged_walk($wp_query->comments, $depth, $page, $per_page, $r);
+ $walker->paged_walk($wp_query->comments, $max_depth, $page, $per_page, $r);
$wp_query->max_num_comment_pages = $walker->max_pages;
} else {
@@ -1244,9 +1244,9 @@
if ( empty($comments_by_type[$type]) )
return;
- $walker->paged_walk($comments_by_type[$type], $depth, $page, $per_page, $r);
+ $walker->paged_walk($comments_by_type[$type], $max_depth, $page, $per_page, $r);
$wp_query->max_num_comment_pages = $walker->max_pages;
return;
}
- $walker->paged_walk($comments, $depth, $page, $per_page, $r);
+ $walker->paged_walk($comments, $max_depth, $page, $per_page, $r);
$wp_query->max_num_comment_pages = $walker->max_pages;
}