Changeset 12121 for trunk/wp-admin/upload.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/upload.php (modified) (4 diffs)

trunk/wp-admin/upload.php

@@ -74 +74 @@
                 $post_ids = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_type='attachment' AND post_status = 'trash'" );
                 $doaction = 'delete';
-        } elseif ( ($_GET['action'] != -1 || $_GET['action2'] != -1) && isset($_GET['media']) ) {
-                $post_ids = $_GET['media'];
+        } elseif ( ( $_GET['action'] != -1 || $_GET['action2'] != -1 ) && ( isset($_GET['media']) || isset($_GET['ids']) ) ) {
+                $post_ids = isset($_GET['media']) ? $_GET['media'] : explode(',', $_GET['ids']);
                 $doaction = ($_GET['action'] != -1) ? $_GET['action'] : $_GET['action2'];
         } else
@@ -83 +83 @@
         if ( $referer = wp_get_referer() ) {
                 if ( false !== strpos($referer, 'upload.php') )
-                        $location = $referer;
+                        $location = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'message', 'ids'), $referer );
         }
 
@@ -95 +95 @@
                                         wp_die( __('Error in moving to trash...') );
                         }
-                        $location = add_query_arg('message', 4, $location);
+                        $location = add_query_arg( array( 'message' => 4, 'ids' => join(',', $post_ids) ), $location );
                         break;
                 case 'untrash':
@@ -203 +203 @@
 $messages[2] = __('Media permanently deleted.');
 $messages[3] = __('Error saving media attachment.');
-$messages[4] = __('Media moved to the trash.') . ' <a href="' . admin_url('upload.php?status=trash') . '">' . __('View trash') . '</a> ';
+$messages[4] = __('Media moved to the trash.') . ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids='.$_GET['ids'], "bulk-media" ) ) . '">' . __('Undo?') . '</a>';
 $messages[5] = __('Media restored from the trash.');