Changeset 10681

Timestamp:

03/02/2009 09:48:37 PM (16 years ago)

Author:

ryan

Message:

Add some error feedback to ajax comment moderation. see #9261

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (2 diffs)
• wp-includes/comment.php (modified) (2 diffs)

trunk/wp-admin/admin-ajax.php

@@ -315 +315 @@
     break;
 case 'dim-comment' : // On success, die with time() instead of 1
-    if ( !$comment = get_comment( $id ) )
-        die('0');
+
+    if ( !$comment = get_comment( $id ) ) {
+        $x = new WP_Ajax_Response( array(
+            'what' => 'comment',
+            'id' => new WP_Error('invalid_comment', sprintf(__('Comment %d does not exist'), $id))
+        ) );
+        $x->send();
+    }
 
     if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
@@ -330 +336 @@
     if ( in_array( $current, array( 'unapproved', 'spam' ) ) ) {
         check_ajax_referer( "approve-comment_$id" );
-        if ( wp_set_comment_status( $comment->comment_ID, 'approve' ) )
-            $r = 1;
+        $result = wp_set_comment_status( $comment->comment_ID, 'approve', true );
     } else {
         check_ajax_referer( "unapprove-comment_$id" );
-        if ( wp_set_comment_status( $comment->comment_ID, 'hold' ) )
-            $r = 1;
-    }
-    if ( $r ) // Decide if we need to send back '1' or a more complicated response including page links and comment counts
-        _wp_ajax_delete_comment_response( $comment->comment_ID );
+        $result = wp_set_comment_status( $comment->comment_ID, 'hold', true );
+    }
+    if ( is_wp_error($result) ) {
+        $x = new WP_Ajax_Response( array(
+            'what' => 'comment',
+            'id' => $result
+        ) );
+        $x->send();
+    }
+
+    // Decide if we need to send back '1' or a more complicated response including page links and comment counts
+    _wp_ajax_delete_comment_response( $comment->comment_ID );
     die( '0' );
     break;

trunk/wp-includes/comment.php

@@ -1015 +1015 @@
  * @param int $comment_id Comment ID.
  * @param string $comment_status New comment status, either 'hold', 'approve', 'spam', or 'delete'.
+ * @param bool $wp_error Whether to return a WP_Error object if there is a failure. Default is false.
  * @return bool False on failure or deletion and true on success.
  */
-function wp_set_comment_status($comment_id, $comment_status) {
+function wp_set_comment_status($comment_id, $comment_status, $wp_error = false) {
     global $wpdb;
 
@@ -1041 +1042 @@
     }
 
-    if ( !$wpdb->query($query) )
-        return false;
+    if ( !$wpdb->query($query) ) {
+        if ( $wp_error )
+            return new WP_Error('db_update_error', __('Could not update comment status'), $wpdb->last_error);
+        else
+            return false;
+    }
 
     clean_comment_cache($comment_id);