<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13153] trunk/wp-admin/upload.php:
Improve updated messages in Media Library.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13153">13153</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-14 13:17:31 +0000 (Sun, 14 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve updated messages in Media Library. Add plural strings, add Undo links for trash. Fixes <a href="http://trac.wordpress.org/ticket/11402">#11402</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminuploadphp">trunk/wp-admin/upload.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upload.php (13152 => 13153)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upload.php 2010-02-14 11:52:27 UTC (rev 13152)
+++ trunk/wp-admin/upload.php 2010-02-14 13:17:31 UTC (rev 13153)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> if ( !wp_trash_post($post_id) )
</span><span class="cx"> wp_die( __('Error in moving to trash...') );
</span><span class="cx"> }
</span><del>- $location = add_query_arg( array( 'message' => 4, 'ids' => join(',', $post_ids) ), $location );
</del><ins>+ $location = add_query_arg( array( 'trashed' => count($post_ids), 'ids' => join(',', $post_ids) ), $location );
</ins><span class="cx"> break;
</span><span class="cx"> case 'untrash':
</span><span class="cx"> foreach( (array) $post_ids as $post_id ) {
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> if ( !wp_untrash_post($post_id) )
</span><span class="cx"> wp_die( __('Error in restoring from trash...') );
</span><span class="cx"> }
</span><del>- $location = add_query_arg('message', 5, $location);
</del><ins>+ $location = add_query_arg('untrashed', count($post_ids), $location);
</ins><span class="cx"> break;
</span><span class="cx"> case 'delete':
</span><span class="cx"> foreach( (array) $post_ids as $post_id_del ) {
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> if ( !wp_delete_attachment($post_id_del) )
</span><span class="cx"> wp_die( __('Error in deleting...') );
</span><span class="cx"> }
</span><del>- $location = add_query_arg('message', 2, $location);
</del><ins>+ $location = add_query_arg('deleted', count($post_ids), $location);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -175,28 +175,29 @@
</span><span class="cx"> <?php
</span><span class="cx"> $message = '';
</span><span class="cx"> if ( isset($_GET['posted']) && (int) $_GET['posted'] ) {
</span><del>- $_GET['message'] = '1';
</del><ins>+ $message = __('Media attachment updated.');
</ins><span class="cx"> $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset($_GET['attached']) && (int) $_GET['attached'] ) {
</span><span class="cx"> $attached = (int) $_GET['attached'];
</span><del>- $message = sprintf( _n('Reattached %d attachment', 'Reattached %d attachments', $attached), $attached );
</del><ins>+ $message = sprintf( _n('Reattached %d attachment.', 'Reattached %d attachments.', $attached), $attached );
</ins><span class="cx"> $_SERVER['REQUEST_URI'] = remove_query_arg(array('attached'), $_SERVER['REQUEST_URI']);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset($_GET['deleted']) && (int) $_GET['deleted'] ) {
</span><del>- $_GET['message'] = '2';
</del><ins>+ $message = sprintf( _n( 'Media attachment permanently deleted.', '%d media attachments permanently deleted.', $_GET['deleted'] ), number_format_i18n( $_GET['deleted'] ) );
</ins><span class="cx"> $_SERVER['REQUEST_URI'] = remove_query_arg(array('deleted'), $_SERVER['REQUEST_URI']);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset($_GET['trashed']) && (int) $_GET['trashed'] ) {
</span><del>- $_GET['message'] = '4';
</del><ins>+ $message = sprintf( _n( 'Media attachment moved to the trash.', '%d media attachments moved to the trash.', $_GET['trashed'] ), number_format_i18n( $_GET['trashed'] ) );
+ $message .= ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media" ) ) . '">' . __('Undo') . '</a>';
</ins><span class="cx"> $_SERVER['REQUEST_URI'] = remove_query_arg(array('trashed'), $_SERVER['REQUEST_URI']);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset($_GET['untrashed']) && (int) $_GET['untrashed'] ) {
</span><del>- $_GET['message'] = '5';
</del><ins>+ $message = sprintf( _n( 'Media attachment restored from the trash.', '%d media attachments restored from the trash.', $_GET['untrashed'] ), number_format_i18n( $_GET['untrashed'] ) );
</ins><span class="cx"> $_SERVER['REQUEST_URI'] = remove_query_arg(array('untrashed'), $_SERVER['REQUEST_URI']);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>