Ticket #22380: improve-hooks-comments.patch

wp-includes/comment-template.php

@@ -32 +32 @@
         } else {
                 $author = $comment->comment_author;
         }
-        return apply_filters('get_comment_author', $author);
+        return apply_filters('get_comment_author', $author, $comment_ID, $comment);
 }
 
 /**
@@ -44 +44 @@
  * @param int $comment_ID The ID of the comment for which to print the author. Optional.
  */
 function comment_author( $comment_ID = 0 ) {
-        $author = apply_filters('comment_author', get_comment_author( $comment_ID ) );
+        $author = apply_filters('comment_author', get_comment_author( $comment_ID ), $comment_ID );
         echo $author;
 }
 
@@ -60 +60 @@
  */
 function get_comment_author_email( $comment_ID = 0 ) {
         $comment = get_comment( $comment_ID );
-        return apply_filters('get_comment_author_email', $comment->comment_author_email);
+        return apply_filters('get_comment_author_email', $comment->comment_author_email, $comment_ID);
 }
 
 /**
@@ -78 +78 @@
  * @param int $comment_ID The ID of the comment for which to print the author's email. Optional.
  */
 function comment_author_email( $comment_ID = 0 ) {
-        echo apply_filters('author_email', get_comment_author_email( $comment_ID ) );
+        echo apply_filters('author_email', get_comment_author_email( $comment_ID ), $comment_ID );
 }
 
 /**
@@ -153 +153 @@
                 $return = $author;
         else
                 $return = "<a href='$url' rel='external nofollow' class='url'>$author</a>";
-        return apply_filters('get_comment_author_link', $return);
+        return apply_filters('get_comment_author_link', $return, $comment_ID);
 }
 
 /**
@@ -180 +180 @@
  */
 function get_comment_author_IP( $comment_ID = 0 ) {
         $comment = get_comment( $comment_ID );
-        return apply_filters('get_comment_author_IP', $comment->comment_author_IP);
+        return apply_filters('get_comment_author_IP', $comment->comment_author_IP, $comment_ID);
 }
 
 /**
@@ -208 +208 @@
         $comment = get_comment( $comment_ID );
         $url = ('http://' == $comment->comment_author_url) ? '' : $comment->comment_author_url;
         $url = esc_url( $url, array('http', 'https') );
-        return apply_filters('get_comment_author_url', $url);
+        return apply_filters('get_comment_author_url', $url, $comment_ID, $comment);
 }
 
 /**
@@ -221 +221 @@
  * @param int $comment_ID The ID of the comment for which to print the author's URL. Optional.
  */
 function comment_author_url( $comment_ID = 0 ) {
-        echo apply_filters('comment_url', get_comment_author_url( $comment_ID ));
+        echo apply_filters('comment_url', get_comment_author_url( $comment_ID ), $comment_ID);
 }
 
 /**
@@ -375 +375 @@
                 $date = mysql2date(get_option('date_format'), $comment->comment_date);
         else
                 $date = mysql2date($d, $comment->comment_date);
-        return apply_filters('get_comment_date', $date, $d);
+        return apply_filters('get_comment_date', $date, $d, $comment_ID);
 }
 
 /**
@@ -420 +420 @@
                 $excerpt .= $blah[$i] . ' ';
         }
         $excerpt .= ($use_dotdotdot) ? '...' : '';
-        return apply_filters('get_comment_excerpt', $excerpt);
+        return apply_filters('get_comment_excerpt', $excerpt, $comment_ID);
 }
 
 /**
@@ -432 +432 @@
  * @param int $comment_ID The ID of the comment for which to print the excerpt. Optional.
  */
 function comment_excerpt( $comment_ID = 0 ) {
-        echo apply_filters('comment_excerpt', get_comment_excerpt($comment_ID) );
+        echo apply_filters('comment_excerpt', get_comment_excerpt($comment_ID), $comment_ID );
 }
 
 /**
@@ -662 +662 @@
         if ( '' == $comment->comment_type )
                 $comment->comment_type = 'comment';
 
-        return apply_filters('get_comment_type', $comment->comment_type);
+        return apply_filters('get_comment_type', $comment->comment_type, $comment_ID, $comment);
 }
 
 /**