Changeset 34130

Timestamp:

09/14/2015 09:46:40 PM (10 years ago)

Author:

wonderboymusic

Message:

wp_unspam_comment() can accept a full object instead of comment_ID to reduce cache/db lookups..

See #33638.

Location:

trunk/src

Files:

• wp-admin/comment.php (modified) (1 diff)
• wp-admin/includes/ajax-actions.php (modified) (2 diffs)
• wp-includes/comment-functions.php (modified) (3 diffs)

trunk/src/wp-admin/comment.php

@@ -259 +259 @@
     switch ( $action ) {
         case 'deletecomment' :
-            wp_delete_comment( $comment_id );
+            wp_delete_comment( $comment );
             $redir = add_query_arg( array('deleted' => '1'), $redir );
             break;
         case 'trashcomment' :
-            wp_trash_comment($comment_id);
+            wp_trash_comment( $comment );
             $redir = add_query_arg( array('trashed' => '1', 'ids' => $comment_id), $redir );
             break;
         case 'untrashcomment' :
-            wp_untrash_comment($comment_id);
+            wp_untrash_comment( $comment );
             $redir = add_query_arg( array('untrashed' => '1'), $redir );
             break;
         case 'spamcomment' :
-            wp_spam_comment($comment_id);
+            wp_spam_comment( $comment );
             $redir = add_query_arg( array('spammed' => '1', 'ids' => $comment_id), $redir );
             break;
         case 'unspamcomment' :
-            wp_unspam_comment($comment_id);
+            wp_unspam_comment( $comment );
             $redir = add_query_arg( array('unspammed' => '1'), $redir );
             break;

trunk/src/wp-admin/includes/ajax-actions.php

@@ -527 +527 @@
         if ( 'trash' == $status )
             wp_die( time() );
-        $r = wp_trash_comment( $comment->comment_ID );
+        $r = wp_trash_comment( $comment );
     } elseif ( isset($_POST['untrash']) && 1 == $_POST['untrash'] ) {
         if ( 'trash' != $status )
             wp_die( time() );
-        $r = wp_untrash_comment( $comment->comment_ID );
+        $r = wp_untrash_comment( $comment );
         if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'trash' ) // undo trash, not in trash
             $delta = 1;
@@ -537 +537 @@
         if ( 'spam' == $status )
             wp_die( time() );
-        $r = wp_spam_comment( $comment->comment_ID );
+        $r = wp_spam_comment( $comment );
     } elseif ( isset($_POST['unspam']) && 1 == $_POST['unspam'] ) {
         if ( 'spam' != $status )
             wp_die( time() );
-        $r = wp_unspam_comment( $comment->comment_ID );
+        $r = wp_unspam_comment( $comment );
         if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'spam' ) // undo spam, not in spam
             $delta = 1;
     } elseif ( isset($_POST['delete']) && 1 == $_POST['delete'] ) {
-        $r = wp_delete_comment( $comment->comment_ID );
+        $r = wp_delete_comment( $comment );
     } else {
         wp_die( -1 );

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

@@ -1165 +1165 @@
  * @since 2.9.0
  *
- * @param int $comment_id Comment ID.
+ * @param int|WP_Comment $comment_id Comment ID or WP_Comment object.
  * @return bool True on success, false on failure.
  */
-function wp_unspam_comment($comment_id) {
-    if ( ! (int)$comment_id )
-        return false;
-
+function wp_unspam_comment( $comment_id ) {
     $comment = get_comment( $comment_id );
     if ( ! $comment ) {
@@ -1184 +1181 @@
      * @param int $comment_id The comment ID.
      */
-    do_action( 'unspam_comment', $comment_id );
-
-    $status = (string) get_comment_meta($comment_id, '_wp_trash_meta_status', true);
+    do_action( 'unspam_comment', $comment->comment_ID );
+
+    $status = (string) get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true );
     if ( empty($status) )
         $status = '0';
 
     if ( wp_set_comment_status( $comment, $status ) ) {
-        delete_comment_meta( $comment_id, '_wp_trash_meta_status' );
-        delete_comment_meta( $comment_id, '_wp_trash_meta_time' );
+        delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_status' );
+        delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_time' );
         /**
          * Fires immediately after a comment is unmarked as Spam.
@@ -1200 +1197 @@
          * @param int $comment_id The comment ID.
          */
-        do_action( 'unspammed_comment', $comment_id );
+        do_action( 'unspammed_comment', $comment->comment_ID );
         return true;
     }