WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

['depth'] during the wp_list_comments should be ['max_depth']. Props ShaneF. fixes #8018 

git-svn-id: http://svn.automattic.com/wordpress/trunk@9424 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-10-31 02:58:22 +00:00
parent 22740d5394
commit 5024fd6632
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wp-includes/comment-template.php
View File

@ -1129,7 +1129,7 @@ class Walker_Comment extends Walker {
<?php comment_text() ?> <?php comment_text() ?>
<div class="reply"> <div class="reply">
<?php comment_reply_link(array_merge( $args, array('add_below' => $add_below, 'depth' => $depth, 'max_depth' => $args['depth']))) ?> <?php comment_reply_link(array_merge( $args, array('add_below' => $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth']))) ?>
</div> </div>
<?php if ( 'ul' == $args['style'] ) : ?> <?php if ( 'ul' == $args['style'] ) : ?>
</div> </div>
@ -1176,7 +1176,7 @@ function wp_list_comments($args = array(), $comments = null ) {
$comment_alt = $comment_thread_alt = 0; $comment_alt = $comment_thread_alt = 0;
$comment_depth = 1; $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' => ''); 'page' => '', 'per_page' => '', 'avatar_size' => 32, 'reverse_top_level' => null, 'reverse_children' => '');
$r = wp_parse_args( $args, $defaults ); $r = wp_parse_args( $args, $defaults );
@ -1189,11 +1189,11 @@ function wp_list_comments($args = array(), $comments = null ) {
$r['page'] = 0; $r['page'] = 0;
} }
if ( '' === $r['depth'] ) { if ( '' === $r['max_depth'] ) {
if ( get_option('thread_comments') ) if ( get_option('thread_comments') )
$r['depth'] = get_option('thread_comments_depth'); $r['max_depth'] = get_option('thread_comments_depth');
else else
$r['depth'] = -1; $r['max_depth'] = -1;
} }
if ( '' === $r['page'] ) { if ( '' === $r['page'] ) {
@ -1203,7 +1203,7 @@ function wp_list_comments($args = array(), $comments = null ) {
if ( empty($overridden_cpage) ) { if ( empty($overridden_cpage) ) {
$r['page'] = get_query_var('cpage'); $r['page'] = get_query_var('cpage');
} else { } 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; $r['page'] = ( 'newest' == get_option('default_comments_page') ) ? get_comment_pages_count($comments, $r['per_page'], $threaded) : 1;
set_query_var( 'cpage', $r['page'] ); set_query_var( 'cpage', $r['page'] );
} }
@ -1230,11 +1230,11 @@ function wp_list_comments($args = array(), $comments = null ) {
$wp_query->comments_by_type = &separate_comments($wp_query->comments); $wp_query->comments_by_type = &separate_comments($wp_query->comments);
if ( empty($wp_query->comments_by_type[$type]) ) if ( empty($wp_query->comments_by_type[$type]) )
return; 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; $wp_query->max_num_comment_pages = $walker->max_pages;
return; 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; $wp_query->max_num_comment_pages = $walker->max_pages;
} else { } else {
if ( empty($comments) ) if ( empty($comments) )
@ -1243,11 +1243,11 @@ function wp_list_comments($args = array(), $comments = null ) {
$comments_by_type = &separate_comments($comments); $comments_by_type = &separate_comments($comments);
if ( empty($comments_by_type[$type]) ) if ( empty($comments_by_type[$type]) )
return; 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; $wp_query->max_num_comment_pages = $walker->max_pages;
return; 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; $wp_query->max_num_comment_pages = $walker->max_pages;
} }
} }