Changeset 11952

Timestamp:

09/19/2009 01:06:17 AM (16 years ago)

Author:

azaozz

Message:

Add "View trash" link to the notice after moving to the trash

Location:

trunk/wp-admin

Files:

• edit-comments.php (modified) (1 diff)
• edit-pages.php (modified) (1 diff)
• edit.php (modified) (1 diff)
• upload.php (modified) (2 diffs)

trunk/wp-admin/edit-comments.php

@@ -130 +130 @@
         if ( $trashed > 0 ) {
             printf( _n( '%s comment moved to the trash', '%s comments moved to the trash', $trashed ), $trashed );
-            echo '<br />';
+            echo ' <a href="' . admin_url('edit-comments.php?comment_status=trash') . '">' . __('View trash') . '</a><br />';
         }
         if ( $untrashed > 0 ) {

trunk/wp-admin/edit-pages.php

@@ -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> ';
     unset($_GET['trashed']);
 }

trunk/wp-admin/edit.php

@@ -168 +168 @@
 if ( isset($_GET['trashed']) && (int) $_GET['trashed'] ) {
     printf( _n( 'Post moved to the trash.', '%s posts moved to the trash.', $_GET['trashed'] ), number_format_i18n( $_GET['trashed'] ) );
+    echo ' <a href="' . admin_url('edit.php?post_status=trash') . '">' . __('View trash') . '</a> ';
     unset($_GET['trashed']);
 }

trunk/wp-admin/upload.php

@@ -166 +166 @@
 
 wp_enqueue_script('media');
-require_once('admin-header.php'); ?>
-
-<?php
-if ( isset($_GET['posted']) && (int) $_GET['posted'] ) {
-    $_GET['message'] = '1';
-    $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
-}
-
-if ( isset($_GET['attached']) && (int) $_GET['attached'] ) {
-    $attached = (int) $_GET['attached'];
-    $message = sprintf( _n('Reattached %d attachment', 'Reattached %d attachments', $attached), $attached );
-    $_SERVER['REQUEST_URI'] = remove_query_arg(array('attached'), $_SERVER['REQUEST_URI']);
-}
-
-$messages[1] = __('Media attachment updated.');
-$messages[2] = __('Media deleted.');
-$messages[3] = __('Error saving media attachment.');
-$messages[4] = __('Media moved to Trash.');
-$messages[5] = __('Media removed from Trash.');
-
-if ( isset($_GET['message']) && (int) $_GET['message'] ) {
-    $message = $messages[$_GET['message']];
-    $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
-}
+require_once('admin-header.php');
+
+do_action('restrict_manage_posts');
 ?>
-
-<?php do_action('restrict_manage_posts'); ?>
 
 <div class="wrap">
@@ -201 +178 @@
 </h2>
 
-<?php
-if ( isset($message) ) { ?>
+<?php 
+$message = '';
+if ( isset($_GET['posted']) && (int) $_GET['posted'] ) {
+    $_GET['message'] = '1';
+    $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
+}
+
+if ( isset($_GET['attached']) && (int) $_GET['attached'] ) {
+    $attached = (int) $_GET['attached'];
+    $message = sprintf( _n('Reattached %d attachment', 'Reattached %d attachments', $attached), $attached );
+    $_SERVER['REQUEST_URI'] = remove_query_arg(array('attached'), $_SERVER['REQUEST_URI']);
+}
+
+if ( isset($_GET['deleted']) && (int) $_GET['deleted'] ) {
+    $_GET['message'] = '2';
+    $_SERVER['REQUEST_URI'] = remove_query_arg(array('deleted'), $_SERVER['REQUEST_URI']);
+}
+
+if ( isset($_GET['trashed']) && (int) $_GET['trashed'] ) {
+    $_GET['message'] = '4';
+    $_SERVER['REQUEST_URI'] = remove_query_arg(array('trashed'), $_SERVER['REQUEST_URI']);
+}
+
+if ( isset($_GET['untrashed']) && (int) $_GET['untrashed'] ) {
+    $_GET['message'] = '5';
+    $_SERVER['REQUEST_URI'] = remove_query_arg(array('untrashed'), $_SERVER['REQUEST_URI']);
+}
+
+$messages[1] = __('Media attachment updated.');
+$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[5] = __('Media restored from the trash.');
+
+if ( isset($_GET['message']) && (int) $_GET['message'] ) {
+    $message = $messages[$_GET['message']];
+    $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
+}
+
+if ( !empty($message) ) { ?>
 <div id="message" class="updated fade"><p><?php echo $message; ?></p></div>
-<?php
-}
-?>
+<?php } ?>
 
 <ul class="subsubsub">