Changeset 8296

Timestamp:

07/09/08 02:00:21 (2 months ago)

Author:

matt

Message:

Ajax Deleting an object that's already been deleted should silently succeed. Hat tip: mdawaffe. Fixes #7264.

Files:

• trunk/wp-admin/admin-ajax.php (modified) (8 diffs)
• trunk/wp-admin/includes/template.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -31 +31 @@
-    check_ajax_referer( "delete-comment_$id" );
-    if ( !$comment = get_comment( $id ) )
-0
+1
-    if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
-        die('-1');
-
-
+
+
+
-        $r = wp_set_comment_status( $comment->comment_ID, 'spam' );
-else
+} else {
-        $r = wp_delete_comment( $comment->comment_ID );
+    }
-
-    die( $r ? '1' : '0' );
@@ -47 +50 @@
-        die('-1');
-
+    $cat = get_category( $id );
+    if ( !$cat || is_wp_error( $cat ) )
+        die('1');
+
-    if ( wp_delete_category( $id ) )
-        die('1');
-
+
+
-    break;
-case 'delete-tag' :
@@ -56 +64 @@
-        die('-1');
-
+    $tag = get_term( $id, 'post_tag' );
+    if ( !$tag || is_wp_error( $tag ) )
+        die('1');
+
-    if ( wp_delete_term($id, 'post_tag'))
-        die('1');
-
+
+
-    break;
-case 'delete-link-cat' :
@@ -64 +77 @@
-    if ( !current_user_can( 'manage_categories' ) )
-        die('-1');
+
+    $cat = get_term( $id, 'link_category' );
+    if ( !$cat || is_wp_error( $cat ) )
+        die('1');
-
-    $cat_name = get_term_field('name', $id, 'link_category');
@@ -95 +112 @@
-        die('-1');
-
+    $link = get_bookmark( $id );
+    if ( !$link || is_wp_error( $link ) )
+        die('1');
+
-    if ( wp_delete_link( $id ) )
-        die('1');
-
+
+
-    break;
-case 'delete-meta' :
-    check_ajax_referer( "delete-meta_$id" );
-    if ( !$meta = get_post_meta_by_id( $id ) )
-
+
+
-    if ( !current_user_can( 'edit_post', $meta->post_id ) )
-        die('-1');
@@ -114 +137 @@
-        die('-1');
-
+    if ( !get_post( $id ) )
+        die('1');
+
-    if ( wp_delete_post( $id ) )
-        die('1');
@@ -124 +150 @@
-        die('-1');
-
+    if ( !get_page( $id ) )
+        die('1');
+
-    if ( wp_delete_post( $id ) )
-        die('1');
-
+
+
-    break;
-case 'dim-comment' :
-    if ( !$comment = get_comment( $id ) )
-        die('0');
+
-    if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
-        die('-1');
@@ -136 +167 @@
-        die('-1');
-
-
+
+
+
+
+
-        check_ajax_referer( "approve-comment_$id" );
-        if ( wp_set_comment_status( $comment->comment_ID, 'approve' ) )

trunk/wp-admin/includes/template.php

@@ -769 +769 @@
-
-    if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
-
-
+:new=approved
+:new=unapproved
-
-        // we're looking at list of only approved or only unapproved comments
-        if ( 'moderated' == $comment_status ) {
-
+&new=approved
-            unset($actions['unapprove']);
-        } elseif ( 'approved' == $comment_status ) {
-
+&new=unapproved
-            unset($actions['approve']);
-        }