Changeset 34252

Timestamp:

09/16/2015 10:25:07 PM (9 years ago)

Author:

boonebgorges

Message:

Improve consistency of comment notification callback signatures.

Both wp_new_comment_notify_moderator() and wp_new_comment_notify_postauthor()
now accept a single argument: $comment_ID.

Props SergeyBiryukov.
Fixes #33587.

Location:

trunk/src/wp-includes

Files:

• comment-functions.php (modified) (1 diff)
• default-filters.php (modified) (1 diff)

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

@@ -1647 +1647 @@
  * @since 4.4.0
  *
- * @param int $comment_ID       ID of the comment.
- * @param int $comment_approved Whether the comment is approved.
+ * @param int $comment_ID ID of the comment.
  * @return bool True on success, false on failure.
  */
-function wp_new_comment_notify_moderator( $comment_ID, $comment_approved ) {
+function wp_new_comment_notify_moderator( $comment_ID ) {
+    $comment = get_comment( $comment_ID );
+
     // Only send notifications for pending comments.
-    if ( '0' != $comment_approved ) {
+    if ( '0' != $comment->comment_approved ) {
         return false;
     }

trunk/src/wp-includes/default-filters.php

@@ -337 +337 @@
 
 // Email notifications.
-add_action( 'comment_post', 'wp_new_comment_notify_moderator', 10, 2 );
+add_action( 'comment_post', 'wp_new_comment_notify_moderator' );
 add_action( 'comment_post', 'wp_new_comment_notify_postauthor' );
 add_action( 'after_password_reset', 'wp_password_change_notification' );