<!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>[12308] trunk/wp-admin: Standardize on 'Undo'.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12308">12308</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-12-01 20:00:33 +0000 (Tue, 01 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Standardize on 'Undo'. Props caesarsgrunt. fixes <a href="http://trac.wordpress.org/ticket/11299">#11299</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditcommentsphp">trunk/wp-admin/edit-comments.php</a></li>
<li><a href="#trunkwpadmineditpagesphp">trunk/wp-admin/edit-pages.php</a></li>
<li><a href="#trunkwpadmineditphp">trunk/wp-admin/edit.php</a></li>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminuploadphp">trunk/wp-admin/upload.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-comments.php (12307 => 12308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-comments.php 2009-12-01 19:41:41 UTC (rev 12307)
+++ trunk/wp-admin/edit-comments.php 2009-12-01 20:00:33 UTC (rev 12308)
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> if ( $spammed > 0 ) {
</span><span class="cx"> printf( _n( '%s comment marked as spam.', '%s comments marked as spam.', $spammed ), $spammed );
</span><span class="cx"> $ids = isset($_GET['ids']) ? $_GET['ids'] : 0;
</span><del>- echo ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=unspam&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo?') . '</a><br />';
</del><ins>+ echo ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=unspam&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo') . '</a><br />';
</ins><span class="cx"> }
</span><span class="cx"> if ( $unspammed > 0 ) {
</span><span class="cx"> printf( _n( '%s comment restored from the spam', '%s comments restored from the spam', $unspammed ), $unspammed );
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> if ( $trashed > 0 ) {
</span><span class="cx"> printf( _n( '%s comment moved to the trash.', '%s comments moved to the trash.', $trashed ), $trashed );
</span><span class="cx"> $ids = isset($_GET['ids']) ? $_GET['ids'] : 0;
</span><del>- echo ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=untrash&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo?') . '</a><br />';
</del><ins>+ echo ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=untrash&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo') . '</a><br />';
</ins><span class="cx"> }
</span><span class="cx"> if ( $untrashed > 0 ) {
</span><span class="cx"> printf( _n( '%s comment restored from the trash', '%s comments restored from the trash', $untrashed ), $untrashed );
</span></span></pre></div>
<a id="trunkwpadmineditpagesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-pages.php (12307 => 12308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-pages.php 2009-12-01 19:41:41 UTC (rev 12307)
+++ trunk/wp-admin/edit-pages.php 2009-12-01 20:00:33 UTC (rev 12308)
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> if ( isset($_GET['trashed']) && (int) $_GET['trashed'] ) {
</span><span class="cx"> printf( _n( 'Page moved to the trash.', '%s pages moved to the trash.', $_GET['trashed'] ), number_format_i18n( $_GET['trashed'] ) );
</span><span class="cx"> $ids = isset($_GET['ids']) ? $_GET['ids'] : 0;
</span><del>- echo ' <a href="' . esc_url( wp_nonce_url( "edit-pages.php?doaction=undo&action=untrash&ids=$ids", "bulk-pages" ) ) . '">' . __('Undo?') . '</a><br />';
</del><ins>+ echo ' <a href="' . esc_url( wp_nonce_url( "edit-pages.php?doaction=undo&action=untrash&ids=$ids", "bulk-pages" ) ) . '">' . __('Undo') . '</a><br />';
</ins><span class="cx"> unset($_GET['trashed']);
</span><span class="cx"> }
</span><span class="cx"> if ( isset($_GET['untrashed']) && (int) $_GET['untrashed'] ) {
</span></span></pre></div>
<a id="trunkwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit.php (12307 => 12308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php 2009-12-01 19:41:41 UTC (rev 12307)
+++ trunk/wp-admin/edit.php 2009-12-01 20:00:33 UTC (rev 12308)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> if ( isset($_GET['trashed']) && (int) $_GET['trashed'] ) {
</span><span class="cx"> printf( _n( 'Post moved to the trash.', '%s posts moved to the trash.', $_GET['trashed'] ), number_format_i18n( $_GET['trashed'] ) );
</span><span class="cx"> $ids = isset($_GET['ids']) ? $_GET['ids'] : 0;
</span><del>- echo ' <a href="' . esc_url( wp_nonce_url( "edit.php?doaction=undo&action=untrash&ids=$ids", "bulk-posts" ) ) . '">' . __('Undo?') . '</a><br />';
</del><ins>+ echo ' <a href="' . esc_url( wp_nonce_url( "edit.php?doaction=undo&action=untrash&ids=$ids", "bulk-posts" ) ) . '">' . __('Undo') . '</a><br />';
</ins><span class="cx"> unset($_GET['trashed']);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (12307 => 12308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2009-12-01 19:41:41 UTC (rev 12307)
+++ trunk/wp-admin/includes/media.php 2009-12-01 20:00:33 UTC (rev 12308)
</span><span class="lines">@@ -1233,7 +1233,7 @@
</span><span class="cx"> if ( !EMPTY_TRASH_DAYS )
</span><span class="cx"> $delete = "<a href=\"" . wp_nonce_url("post.php?action=delete&amp;post=$attachment_id", 'delete-post_' . $attachment_id) . "\" id=\"del[$attachment_id]\" class=\"delete\">" . __('Delete Permanently') . "</a>";
</span><span class="cx"> else
</span><del>- $delete = "<a href=\"" . wp_nonce_url("post.php?action=trash&amp;post=$attachment_id", 'trash-post_' . $attachment_id) . "\" id=\"del[$attachment_id]\" class=\"delete\">" . __('Move to Trash') . "</a> <a href=\"" . wp_nonce_url("post.php?action=untrash&amp;post=$attachment_id", 'untrash-post_' . $attachment_id) . "\" id=\"undo[$attachment_id]\" class=\"undo hidden\">" . __('Undo?') . "</a>";
</del><ins>+ $delete = "<a href=\"" . wp_nonce_url("post.php?action=trash&amp;post=$attachment_id", 'trash-post_' . $attachment_id) . "\" id=\"del[$attachment_id]\" class=\"delete\">" . __('Move to Trash') . "</a> <a href=\"" . wp_nonce_url("post.php?action=untrash&amp;post=$attachment_id", 'untrash-post_' . $attachment_id) . "\" id=\"undo[$attachment_id]\" class=\"undo hidden\">" . __('Undo') . "</a>";
</ins><span class="cx"> } else {
</span><span class="cx"> $delete = '';
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upload.php (12307 => 12308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upload.php 2009-12-01 19:41:41 UTC (rev 12307)
+++ trunk/wp-admin/upload.php 2009-12-01 20:00:33 UTC (rev 12308)
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> $messages[1] = __('Media attachment updated.');
</span><span class="cx"> $messages[2] = __('Media permanently deleted.');
</span><span class="cx"> $messages[3] = __('Error saving media attachment.');
</span><del>-$messages[4] = __('Media moved to the trash.') . ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media" ) ) . '">' . __('Undo?') . '</a>';
</del><ins>+$messages[4] = __('Media moved to the trash.') . ' <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"> $messages[5] = __('Media restored from the trash.');
</span><span class="cx">
</span><span class="cx"> if ( isset($_GET['message']) && (int) $_GET['message'] ) {
</span></span></pre>
</div>
</div>
</body>
</html>