Changeset 12008 for trunk/wp-admin/edit-comments.php

Timestamp:

10/08/2009 08:24:59 AM (17 years ago)

Author:

azaozz

Message:

Add Undo when moving comments to the trash, remove unneeded nonces, see #4529

File:

• trunk/wp-admin/edit-comments.php (modified) (4 diffs)

trunk/wp-admin/edit-comments.php

@@ -29 +29 @@
                 $comment_ids = $_REQUEST['delete_comments'];
                 $doaction = ($_REQUEST['action'] != -1) ? $_REQUEST['action'] : $_REQUEST['action2'];
+        } elseif ($_REQUEST['action'] == 'untrash' && isset($_REQUEST['ids'])) {
+                $comment_ids = explode(',', $_REQUEST['ids']);
+                $doaction = 'untrash';
         } else wp_redirect($_SERVER['HTTP_REFERER']);
 
@@ -67 +70 @@
         }
 
-        $redirect_to = 'edit-comments.php?approved=' . $approved . '&unapproved=' . $unapproved . '&spam=' . $spammed . '&trashed=' . $trashed . '&untrashed=' . $untrashed . '&deleted=' . $deleted;
+        $redirect_to = 'edit-comments.php?approved=' . $approved . '&unapproved=' . $unapproved . '&spam=' . $spammed . '&trashed=' . $trashed . '&untrashed=' . $untrashed . '&deleted=' . $deleted . '&ids=' . join(',', $comment_ids);
         if ( $post_id )
                 $redirect_to = add_query_arg( 'p', absint( $post_id ), $redirect_to );
@@ -129 +132 @@
                 }
                 if ( $trashed > 0 ) {
-                        printf( _n( '%s comment moved to the trash', '%s comments moved to the trash', $trashed ), $trashed );
-                        echo ' <a href="' . admin_url('edit-comments.php?comment_status=trash') . '">' . __('View trash') . '</a><br />';
+                        printf( _n( '%s comment moved to the trash.', '%s comments moved to the trash.', $trashed ), $trashed );
+                        $ids = isset($_GET['ids']) ? $_GET['ids'] : 0;
+                        echo ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=untrash&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo?') . '</a><br />';
                 }
                 if ( $untrashed > 0 ) {
@@ -415 +419 @@
 <?php
 wp_comment_reply('-1', true, 'detail');
+wp_comment_trashnotice();
 include('admin-footer.php'); ?>