Changeset 41689 for trunk/src/wp-includes/comment.php

Timestamp:

10/02/2017 10:13:29 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Comments: Pass $comment object to comment actions:

• delete_comment
• deleted_comment
• trash_comment
• trashed_comment
• untrash_comment
• untrashed_comment
• spam_comment
• spammed_comment
• unspam_comment
• unspammed_comment

Props henry.wright.
Fixes #41228.

File:

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

trunk/src/wp-includes/comment.php

@@ -1286 +1286 @@
      *
      * @since 1.2.0
-     *
-     * @param int $comment_id The comment ID.
-     */
-    do_action( 'delete_comment', $comment->comment_ID );
+     * @since 4.9.0 Added the `$comment` parameter.
+     *
+     * @param int        $comment_id The comment ID.
+     * @param WP_Comment $comment    The comment to be deleted.
+     */
+    do_action( 'delete_comment', $comment->comment_ID, $comment );
 
     // Move children up a level.
@@ -1310 +1312 @@
      *
      * @since 2.9.0
-     *
-     * @param int $comment_id The comment ID.
-     */
-    do_action( 'deleted_comment', $comment->comment_ID );
+     * @since 4.9.0 Added the `$comment` parameter.
+     *
+     * @param int        $comment_id The comment ID.
+     * @param WP_Comment $comment    The deleted comment.
+     */
+    do_action( 'deleted_comment', $comment->comment_ID, $comment );
 
     $post_id = $comment->comment_post_ID;
@@ -1349 +1353 @@
      *
      * @since 2.9.0
-     *
-     * @param int $comment_id The comment ID.
-     */
-    do_action( 'trash_comment', $comment->comment_ID );
+     * @since 4.9.0 Added the `$comment` parameter.
+     *
+     * @param int        $comment_id The comment ID.
+     * @param WP_Comment $comment    The comment to be trashed.
+     */
+    do_action( 'trash_comment', $comment->comment_ID, $comment );
 
     if ( wp_set_comment_status( $comment, 'trash' ) ) {
@@ -1364 +1370 @@
          *
          * @since 2.9.0
-         *
-         * @param int $comment_id The comment ID.
+         * @since 4.9.0 Added the `$comment` parameter.
+         *
+         * @param int        $comment_id The comment ID.
+         * @param WP_Comment $comment    The trashed comment.
          */
-        do_action( 'trashed_comment', $comment->comment_ID );
+        do_action( 'trashed_comment', $comment->comment_ID, $comment );
         return true;
     }
@@ -1392 +1400 @@
      *
      * @since 2.9.0
-     *
-     * @param int $comment_id The comment ID.
-     */
-    do_action( 'untrash_comment', $comment->comment_ID );
+     * @since 4.9.0 Added the `$comment` parameter.
+     *
+     * @param int        $comment_id The comment ID.
+     * @param WP_Comment $comment    The comment to be untrashed.
+     */
+    do_action( 'untrash_comment', $comment->comment_ID, $comment );
 
     $status = (string) get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true );
@@ -1408 +1418 @@
          *
          * @since 2.9.0
-         *
-         * @param int $comment_id The comment ID.
+         * @since 4.9.0 Added the `$comment` parameter.
+         *
+         * @param int        $comment_id The comment ID.
+         * @param WP_Comment $comment    The untrashed comment.
          */
-        do_action( 'untrashed_comment', $comment->comment_ID );
+        do_action( 'untrashed_comment', $comment->comment_ID, $comment );
         return true;
     }
@@ -1436 +1448 @@
      *
      * @since 2.9.0
-     *
-     * @param int $comment_id The comment ID.
-     */
-    do_action( 'spam_comment', $comment->comment_ID );
+     * @since 4.9.0 Added the `$comment` parameter.
+     *
+     * @param int        $comment_id The comment ID.
+     * @param WP_Comment $comment    The comment to be marked as spam.
+     */
+    do_action( 'spam_comment', $comment->comment_ID, $comment );
 
     if ( wp_set_comment_status( $comment, 'spam' ) ) {
@@ -1450 +1464 @@
          *
          * @since 2.9.0
-         *
-         * @param int $comment_id The comment ID.
+         * @since 4.9.0 Added the `$comment` parameter.
+         *
+         * @param int        $comment_id The comment ID.
+         * @param WP_Comment $comment    The comment marked as spam.
          */
-        do_action( 'spammed_comment', $comment->comment_ID );
+        do_action( 'spammed_comment', $comment->comment_ID, $comment );
         return true;
     }
@@ -1478 +1494 @@
      *
      * @since 2.9.0
-     *
-     * @param int $comment_id The comment ID.
-     */
-    do_action( 'unspam_comment', $comment->comment_ID );
+     * @since 4.9.0 Added the `$comment` parameter.
+     *
+     * @param int        $comment_id The comment ID.
+     * @param WP_Comment $comment    The comment to be unmarked as spam.
+     */
+    do_action( 'unspam_comment', $comment->comment_ID, $comment );
 
     $status = (string) get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true );
@@ -1494 +1512 @@
          *
          * @since 2.9.0
-         *
-         * @param int $comment_id The comment ID.
+         * @since 4.9.0 Added the `$comment` parameter.
+         *
+         * @param int        $comment_id The comment ID.
+         * @param WP_Comment $comment    The comment unmarked as spam.
          */
-        do_action( 'unspammed_comment', $comment->comment_ID );
+        do_action( 'unspammed_comment', $comment->comment_ID, $comment );
         return true;
     }