Changeset 34129 for trunk/src/wp-includes/pluggable.php

Timestamp:

09/14/2015 09:39:46 PM (9 years ago)

Author:

wonderboymusic

Message:

More comment functions can accept a full object instead of comment_ID to reduce cache/db lookups.

See ##33638.

File:

• trunk/src/wp-includes/pluggable.php (modified) (7 diffs)

trunk/src/wp-includes/pluggable.php

@@ -1354 +1354 @@
  * @since 1.0.0
  *
- * @param int    $comment_id Comment ID
- * @param string $deprecated Not used
+ * @param int|WP_Comment  $comment_id Comment ID or WP_Comment object.
+ * @param string          $deprecated Not used
  * @return bool True on completion. False if no email addresses were specified.
  */
@@ -1387 +1387 @@
      * @param int   $comment_id The comment ID.
      */
-    $emails = apply_filters( 'comment_notification_recipients', $emails, $comment_id );
+    $emails = apply_filters( 'comment_notification_recipients', $emails, $comment->comment_ID );
     $emails = array_filter( $emails );
 
@@ -1410 +1410 @@
      * @param int  $comment_id The comment ID.
      */
-    $notify_author = apply_filters( 'comment_notification_notify_author', false, $comment_id );
+    $notify_author = apply_filters( 'comment_notification_notify_author', false, $comment->comment_ID );
 
     // The comment was left by the author
@@ -1476 +1476 @@
     $notify_message .= sprintf( __('Permalink: %s'), get_comment_link( $comment ) ) . "\r\n";
 
-    if ( user_can( $post->post_author, 'edit_comment', $comment_id ) ) {
-        if ( EMPTY_TRASH_DAYS )
-            $notify_message .= sprintf( __('Trash it: %s'), admin_url("comment.php?action=trash&c=$comment_id") ) . "\r\n";
-        else
-            $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=delete&c=$comment_id") ) . "\r\n";
-        $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=spam&c=$comment_id") ) . "\r\n";
+    if ( user_can( $post->post_author, 'edit_comment', $comment->comment_ID ) ) {
+        if ( EMPTY_TRASH_DAYS ) {
+            $notify_message .= sprintf( __('Trash it: %s'), admin_url("comment.php?action=trash&c={$comment->comment_ID}") ) . "\r\n";
+        } else {
+            $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=delete&c={$comment->comment_ID}") ) . "\r\n";
+        }
+        $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=spam&c={$comment->comment_ID}") ) . "\r\n";
     }
 
@@ -1510 +1511 @@
      * @param int    $comment_id     Comment ID.
      */
-    $notify_message = apply_filters( 'comment_notification_text', $notify_message, $comment_id );
+    $notify_message = apply_filters( 'comment_notification_text', $notify_message, $comment->comment_ID );
 
     /**
@@ -1520 +1521 @@
      * @param int    $comment_id Comment ID.
      */
-    $subject = apply_filters( 'comment_notification_subject', $subject, $comment_id );
+    $subject = apply_filters( 'comment_notification_subject', $subject, $comment->comment_ID );
 
     /**
@@ -1530 +1531 @@
      * @param int    $comment_id      Comment ID.
      */
-    $message_headers = apply_filters( 'comment_notification_headers', $message_headers, $comment_id );
+    $message_headers = apply_filters( 'comment_notification_headers', $message_headers, $comment->comment_ID );
 
     foreach ( $emails as $email ) {