Changeset 34008 for trunk/src/wp-includes/comment-template.php

Timestamp:

09/10/2015 06:09:15 PM (6 years ago)

Author:

wonderboymusic

Message:

After [33961], ensure that comment filters that expect a comment ID are receiving one.

Props dimadin.
Fixes #33809.

File:

• trunk/src/wp-includes/comment-template.php (modified) (17 diffs)

trunk/src/wp-includes/comment-template.php

@@ -43 +43 @@
      * @param WP_Comment $comment    The comment object.
      */
-    return apply_filters( 'get_comment_author', $author, $comment_ID, $comment );
+    return apply_filters( 'get_comment_author', $author, $comment->comment_ID, $comment );
 }
 
@@ -55 +55 @@
  */
 function comment_author( $comment_ID = 0 ) {
-    $author = get_comment_author( $comment_ID );
+    $comment = get_comment( $comment_ID );
+    $author  = get_comment_author( $comment );
 
     /**
@@ -66 +67 @@
      * @param int    $comment_ID The comment ID.
      */
-    echo apply_filters( 'comment_author', $author, $comment_ID );
+    echo apply_filters( 'comment_author', $author, $comment->comment_ID );
 }
 
@@ -91 +92 @@
      * @param WP_Comment $comment              The comment object.
      */
-    return apply_filters( 'get_comment_author_email', $comment->comment_author_email, $comment_ID, $comment );
+    return apply_filters( 'get_comment_author_email', $comment->comment_author_email, $comment->comment_ID, $comment );
 }
 
@@ -109 +110 @@
  */
 function comment_author_email( $comment_ID = 0 ) {
-    $author_email = get_comment_author_email( $comment_ID );
+    $comment      = get_comment( $comment_ID );
+    $author_email = get_comment_author_email( $comment );
 
     /**
@@ -120 +122 @@
      * @param int    $comment_ID   The comment ID.
      */
-    echo apply_filters( 'author_email', $author_email, $comment_ID );
+    echo apply_filters( 'author_email', $author_email, $comment->comment_ID );
 }
 
@@ -200 +202 @@
  */
 function get_comment_author_link( $comment_ID = 0 ) {
-    $url    = get_comment_author_url( $comment_ID );
-    $author = get_comment_author( $comment_ID );
+    $comment = get_comment( $comment_ID );
+    $url     = get_comment_author_url( $comment );
+    $author  = get_comment_author( $comment );
 
     if ( empty( $url ) || 'http://' == $url )
@@ -219 +222 @@
      * @param int    $comment_ID The comment ID.
      */
-    return apply_filters( 'get_comment_author_link', $return, $author, $comment_ID );
+    return apply_filters( 'get_comment_author_link', $return, $author, $comment->comment_ID );
 }
 
@@ -256 +259 @@
      * @param WP_Comment $comment           The comment object.
      */
-    return apply_filters( 'get_comment_author_IP', $comment->comment_author_IP, $comment_ID, $comment );
+    return apply_filters( 'get_comment_author_IP', $comment->comment_author_IP, $comment->comment_ID, $comment );
 }
 
@@ -295 +298 @@
      * @param WP_Comment $comment    The comment object.
      */
-    return apply_filters( 'get_comment_author_url', $url, $comment_ID, $comment );
+    return apply_filters( 'get_comment_author_url', $url, $comment->comment_ID, $comment );
 }
 
@@ -307 +310 @@
  */
 function comment_author_url( $comment_ID = 0 ) {
-    $author_url = get_comment_author_url( $comment_ID );
+    $comment    = get_comment( $comment_ID );
+    $author_url = get_comment_author_url( $comment );
 
     /**
@@ -318 +322 @@
      * @param int    $comment_ID The comment ID.
      */
-    echo apply_filters( 'comment_url', $author_url, $comment_ID );
+    echo apply_filters( 'comment_url', $author_url, $comment->comment_ID );
 }
 
@@ -485 +489 @@
      * @param int|WP_Post $post_id    The post ID or WP_Post object.
      */
-    return apply_filters( 'comment_class', $classes, $class, $comment_id, $comment, $post_id );
+    return apply_filters( 'comment_class', $classes, $class, $comment->comment_ID, $comment, $post_id );
 }
 
@@ -571 +575 @@
      * @param WP_Comment $comment    The comment object.
      */
-    return apply_filters( 'get_comment_excerpt', $excerpt, $comment_ID, $comment );
+    return apply_filters( 'get_comment_excerpt', $excerpt, $comment->comment_ID, $comment );
 }
 
@@ -583 +587 @@
  */
 function comment_excerpt( $comment_ID = 0 ) {
-    $comment_excerpt = get_comment_excerpt($comment_ID);
+    $comment         = get_comment( $comment_ID );
+    $comment_excerpt = get_comment_excerpt( $comment );
 
     /**
@@ -594 +599 @@
      * @param int    $comment_ID      The comment ID.
      */
-    echo apply_filters( 'comment_excerpt', $comment_excerpt, $comment_ID );
+    echo apply_filters( 'comment_excerpt', $comment_excerpt, $comment->comment_ID );
 }
 
@@ -933 +938 @@
      * @param WP_Comment $comment      The comment object.
      */
-    return apply_filters( 'get_comment_type', $comment->comment_type, $comment_ID, $comment );
+    return apply_filters( 'get_comment_type', $comment->comment_type, $comment->comment_ID, $comment );
 }