Changeset 12121 for trunk/wp-admin/edit-pages.php

Timestamp:

10/28/2009 02:46:08 AM (17 years ago)

Author:

azaozz

Message:

Undo for posts, pages and media, props caesarsgrunt, see #4529

File:

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

trunk/wp-admin/edit-pages.php

@@ -16 +16 @@
 if ( isset($_GET['doaction']) || isset($_GET['doaction2']) || isset($_GET['delete_all']) || isset($_GET['delete_all2']) || isset($_GET['bulk_edit']) ) {
         check_admin_referer('bulk-pages');
-        $sendback = wp_get_referer();
+        $sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), wp_get_referer() );
 
         if ( strpos($sendback, 'page.php') !== false )
@@ -25 +25 @@
                 $post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status = %s", $post_status ) );
                 $doaction = 'delete';
-        } elseif ( ($_GET['action'] != -1 || $_GET['action2'] != -1) && isset($_GET['post']) ) {
-                $post_ids = array_map( 'intval', (array) $_GET['post'] );
+        } elseif ( ( $_GET['action'] != -1 || $_GET['action2'] != -1 ) && ( isset($_GET['post']) || isset($_GET['ids']) ) ) {
+                $post_ids = isset($_GET['post']) ? array_map( 'intval', (array) $_GET['post'] ) : explode(',', $_GET['ids']);
                 $doaction = ($_GET['action'] != -1) ? $_GET['action'] : $_GET['action2'];
         } else {
@@ -44 +44 @@
                                 $trashed++;
                         }
-                        $sendback = add_query_arg('trashed', $trashed, $sendback);
+                        $sendback = add_query_arg( array('trashed' => $trashed, 'ids' => join(',', $post_ids)), $sendback );
                         break;
                 case 'untrash':
@@ -164 +164 @@
 if ( isset($_GET['trashed']) && (int) $_GET['trashed'] ) {
         printf( _n( 'Page moved to the trash.', '%s pages moved to the trash.', $_GET['trashed'] ), number_format_i18n( $_GET['trashed'] ) );
-        echo ' <a href="' . admin_url('edit-pages.php?post_status=trash') . '">' . __('View trash') . '</a> ';
+        $ids = isset($_GET['ids']) ? $_GET['ids'] : 0;
+        echo ' <a href="' . esc_url( wp_nonce_url( "edit-pages.php?doaction=undo&action=untrash&ids=$ids", "bulk-pages" ) ) . '">' . __('Undo?') . '</a><br />';
         unset($_GET['trashed']);
 }