Ticket #14856: comment_text args param.diff

wp-includes/comment-template.php

@@ -593 +593 @@
  * @uses $comment
  *
  * @param int $comment_ID The ID of the comment for which to get the text. Optional.
+ * @param array $args Formatting options passed into, for example, wp_list_comments. Optional.
  * @return string The comment content
  */
-function get_comment_text( $comment_ID = 0 ) {
+function get_comment_text( $comment_ID = 0, $args = null ) {
         $comment = get_comment( $comment_ID );
-        return apply_filters('get_comment_text', $comment->comment_content);
+        return apply_filters('get_comment_text', $comment->comment_content, $comment->comment_ID, $args);
 }
 
 /**
@@ -609 +610 @@
  *
  * @param int $comment_ID The ID of the comment for which to print the text. Optional.
  */
-function comment_text( $comment_ID = 0 ) {
-        echo apply_filters('comment_text', get_comment_text() );
+function comment_text( $comment_ID = 0, $args = null ) {
+        if ( ! $comment_ID )
+                $comment_ID = get_comment_ID();
+        echo apply_filters('comment_text', get_comment_text( $comment_ID, $args ), $comment_ID, $args );
 }
 
 /**
@@ -1322 +1325 @@
          * @param string $output Passed by reference. Used to append additional content.
          * @param object $comment Comment data object.
          * @param int $depth Depth of comment in reference to parents.
+         * @param array $args Formatting options
          * @param array $args
          */
         function start_el(&$output, $comment, $depth, $args) {
@@ -1364 +1368 @@
                         ?>
                 </div>
 
-                <?php comment_text() ?>
+                <?php comment_text( null, array_merge( $args, array('add_below' => $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth'])) ) ?>
 
                 <div class="reply">
-                <?php comment_reply_link(array_merge( $args, array('add_below' => $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth']))) ?>
+                        <?php comment_reply_link(array_merge( $args, array('add_below' => $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth']))) ?>
                 </div>
                 <?php if ( 'div' != $args['style'] ) : ?>
                 </div>