Index: wp-includes/comment-template.php
===================================================================
--- wp-includes/comment-template.php (revision 12022)
+++ wp-includes/comment-template.php (working copy)
@@ -1192,11 +1192,11 @@
case 'div':
break;
case 'ol':
- echo "
\n";
+ $output .= "\n";
break;
default:
case 'ul':
- echo "\n";
+ $output .= "\n";
break;
}
}
@@ -1216,11 +1216,11 @@
case 'div':
break;
case 'ol':
- echo "
\n";
+ $output .= "
\n";
break;
default:
case 'ul':
- echo "\n";
+ $output .= "\n";
break;
}
}
@@ -1253,31 +1253,32 @@
$tag = 'li';
$add_below = 'div-comment';
}
-?>
- < id="comment-">
-
- ' . "\n";
+ if ( 'ul' == $args['style'] ) :
+ $output .= '' . "\n";
+ endif;
}
/**
@@ -1295,9 +1296,9 @@
return;
}
if ( 'div' == $args['style'] )
- echo "\n";
+ $output .= "\n";
else
- echo "\n";
+ $output .= "\n";
}
}
@@ -1322,7 +1323,7 @@
$comment_depth = 1;
$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' => '', 'echo' => 1);
$r = wp_parse_args( $args, $defaults );
@@ -1390,10 +1391,15 @@
if ( empty($walker) )
$walker = new Walker_Comment;
- $walker->paged_walk($_comments, $max_depth, $page, $per_page, $r);
+ $output = $walker->paged_walk($_comments, $max_depth, $page, $per_page, $r);
$wp_query->max_num_comment_pages = $walker->max_pages;
$in_comment_loop = false;
+
+ if ( $r['echo'] )
+ echo $output;
+ else
+ return $output;
}
?>
Index: wp-includes/link-template.php
===================================================================
--- wp-includes/link-template.php (revision 12022)
+++ wp-includes/link-template.php (working copy)
@@ -820,7 +820,7 @@
* @param string $after Optional. Display after edit link.
* @return string|null HTML content, if $echo is set to false.
*/
-function edit_comment_link( $link = null, $before = '', $after = '' ) {
+function edit_comment_link( $link = null, $before = '', $after = '', $echo = true ) {
global $comment, $post;
if ( $post->post_type == 'page' ) {
@@ -835,7 +835,10 @@
$link = __('Edit This');
$link = '';
- echo $before . apply_filters( 'edit_comment_link', $link, $comment->comment_ID ) . $after;
+ if ($echo)
+ echo $before . apply_filters( 'edit_comment_link', $link, $comment->comment_ID ) . $after;
+ else
+ return $before . apply_filters( 'edit_comment_link', $link, $comment->comment_ID ) . $after;
}
/**
- -
. "\n"'; + endif; - + $output .= '