vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 14:20:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

First cut of comment paging. Add paging and threading settings. see #7769 #7635

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@8961 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2008-09-23 21:11:27 +00:00
parent 67fabf2691
commit 23fd52bd85
8 changed files with 190 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -850,7 +850,7 @@ function comment_reply_link($args = array(), $comment = null, $post = null) {
$args = wp_parse_args($args, $defaults);
if ( 0 == $args['depth'] || $args['max_depth'] < $args['depth'] )
if ( 0 == $args['depth'] || $args['max_depth'] <= $args['depth'] )
return;
extract($args, EXTR_SKIP);
@@ -973,15 +973,34 @@ class Walker_Comment extends Walker {
* @uses Walker_Comment
*
* @param $args string|array Formatting options
* @param $comments array Optional array of comment objects. Defaults to $wp_query->comments
* @param $comments array Optional array of comment objects. Defaults to $wp_query->comments
*/
function wp_list_comments($args = array(), $comments = null ) {
global $wp_query;
$defaults = array('walker' => null, 'depth' => 3, 'style' => 'ul', 'callback' => null, 'end-callback' => null, 'type' => 'all');
$defaults = array('walker' => null, 'depth' => '', 'style' => 'ul', 'callback' => null, 'end-callback' => null, 'type' => 'all',
'page' => get_query_var('cpage'), 'per_page' => '');
$r = wp_parse_args( $args, $defaults );
if ( '' === $r['per_page'] && get_option('page_comments') )
$r['per_page'] = get_query_var('comments_per_page');
if ( empty($r['per_page']) ) {
$r['page'] = 0;
} else {
$r['page'] = intval($r['page']);
if ( empty($r['page']) )
$r['page'] = 1;
}
if ( '' === $r['depth'] ) {
if ( get_option('thread_comments') )
$r['depth'] = get_option('thread_comments_depth');
else
$r['depth'] = -1;
}
extract( $r, EXTR_SKIP );
if ( empty($walker) )
@@ -995,19 +1014,25 @@ function wp_list_comments($args = array(), $comments = null ) {
$wp_query->comments_by_type = &separate_comments($wp_query->comments);
if ( empty($wp_query->comments_by_type[$type]) )
return;
return $walker->walk($wp_query->comments_by_type[$type], $depth, $r);
$walker->paged_walk($wp_query->comments_by_type[$type], $depth, $page, $per_page, $r);
$wp_query->max_num_comment_pages = $walker->max_pages;
return;
}
$walker->walk($wp_query->comments, $depth, $r);
$walker->paged_walk($wp_query->comments, $depth, $page, $per_page, $r);
$wp_query->max_num_comment_pages = $walker->max_pages;
} else {
if ( empty($comments) )
return;
if ( 'all' != $type ) {
$comments_by_type = separate_comments($comments);
$comments_by_type = &separate_comments($comments);
if ( empty($comments_by_type[$type]) )
return;
return $walker->walk($comments_by_type[$type], $depth, $r);
$walker->paged_walk($comments_by_type[$type], $depth, $page, $per_page, $r);
$wp_query->max_num_comment_pages = $walker->max_pages;
return;
}
$walker->walk($comments, $depth, $r);
$walker->paged_walk($comments, $depth, $page, $per_page, $r);
$wp_query->max_num_comment_pages = $walker->max_pages;
}
}