<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[11779] trunk/wp-admin: Notice fixes, props mrmist, see #4529</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11779">11779</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2009-08-06 00:40:39 +0000 (Thu, 06 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Notice fixes, props mrmist, see <a href="http://trac.wordpress.org/ticket/4529">#4529</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-comments.php (11778 => 11779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-comments.php 2009-08-05 23:50:29 UTC (rev 11778)
+++ trunk/wp-admin/edit-comments.php 2009-08-06 00:40:39 UTC (rev 11779)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> echo '<br />';
</span><span class="cx"> }
</span><span class="cx"> if ( $untrashed > 0 ) {
</span><del>- printf( _n( '%s comment removed from the trash', '%s comments removed from the trash', $untrashed ), $untrashed );
</del><ins>+ printf( _n( '%s comment restored from the trash', '%s comments restored from the trash', $untrashed ), $untrashed );
</ins><span class="cx"> echo '<br />';
</span><span class="cx"> }
</span><span class="cx"> if ( $deleted > 0 ) {
</span></span></pre></div>
<a id="trunkwpadmineditpagesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-pages.php (11778 => 11779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-pages.php 2009-08-05 23:50:29 UTC (rev 11778)
+++ trunk/wp-admin/edit-pages.php 2009-08-06 00:40:39 UTC (rev 11779)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> unset($_GET['trashed']);
</span><span class="cx"> }
</span><span class="cx"> if ( isset($_GET['untrashed']) && (int) $_GET['untrashed'] ) {
</span><del>- printf( _n( 'Page removed from the trash.', '%s pages removed from the trash.', $_GET['untrashed'] ), number_format_i18n( $_GET['untrashed'] ) );
</del><ins>+ printf( _n( 'Page restored from the trash.', '%s pages restored from the trash.', $_GET['untrashed'] ), number_format_i18n( $_GET['untrashed'] ) );
</ins><span class="cx"> unset($_GET['untrashed']);
</span><span class="cx"> }
</span><span class="cx"> $_SERVER['REQUEST_URI'] = remove_query_arg( array('locked', 'skipped', 'updated', 'deleted', 'trashed', 'untrashed'), $_SERVER['REQUEST_URI'] );
</span><span class="lines">@@ -239,6 +239,8 @@
</span><span class="cx"> 'current' => $pagenum
</span><span class="cx"> ));
</span><span class="cx">
</span><ins>+$is_trash = isset($_GET['post_status']) && $_GET['post_status'] == 'trash';
+
</ins><span class="cx"> if ( $page_links ) : ?>
</span><span class="cx"> <div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
</span><span class="cx"> number_format_i18n( ( $pagenum - 1 ) * $per_page + 1 ),
</span><span class="lines">@@ -251,7 +253,7 @@
</span><span class="cx"> <div class="alignleft actions">
</span><span class="cx"> <select name="action">
</span><span class="cx"> <option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option>
</span><del>-<?php if ($_GET['post_status'] == 'trash') { ?>
</del><ins>+<?php if ( $is_trash ) { ?>
</ins><span class="cx"> <option value="untrash"><?php _e('Restore'); ?></option>
</span><span class="cx"> <option value="delete"><?php _e('Delete Permanently'); ?></option>
</span><span class="cx"> <?php } else { ?>
</span><span class="lines">@@ -261,7 +263,7 @@
</span><span class="cx"> </select>
</span><span class="cx"> <input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
</span><span class="cx"> <?php wp_nonce_field('bulk-pages'); ?>
</span><del>-<?php if ($_GET['post_status'] == 'trash') { ?>
</del><ins>+<?php if ( $is_trash ) { ?>
</ins><span class="cx"> <input type="submit" name="delete_all" id="delete_all" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
</span><span class="cx"> <?php } ?>
</span><span class="cx"> </div>
</span><span class="lines">@@ -298,7 +300,7 @@
</span><span class="cx"> <div class="alignleft actions">
</span><span class="cx"> <select name="action2">
</span><span class="cx"> <option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option>
</span><del>-<?php if ($_GET['post_status'] == 'trash') { ?>
</del><ins>+<?php if ( $is_trash ) { ?>
</ins><span class="cx"> <option value="untrash"><?php _e('Restore'); ?></option>
</span><span class="cx"> <option value="delete"><?php _e('Delete Permanently'); ?></option>
</span><span class="cx"> <?php } else { ?>
</span><span class="lines">@@ -307,7 +309,7 @@
</span><span class="cx"> <?php } ?>
</span><span class="cx"> </select>
</span><span class="cx"> <input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
</span><del>-<?php if ($_GET['post_status'] == 'trash') { ?>
</del><ins>+<?php if ( $is_trash ) { ?>
</ins><span class="cx"> <input type="submit" name="delete_all2" id="delete_all2" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
</span><span class="cx"> <?php } ?>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit.php (11778 => 11779)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php 2009-08-05 23:50:29 UTC (rev 11778)
+++ trunk/wp-admin/edit.php 2009-08-06 00:40:39 UTC (rev 11779)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> if ( isset($_GET['doaction']) || isset($_GET['doaction2']) || isset($_GET['delete_all']) || isset($_GET['delete_all2']) ) {
</span><span class="cx"> check_admin_referer('bulk-posts');
</span><span class="cx">
</span><del>- if (isset($_GET['delete_all']) || isset($_GET['delete_all2'])) {
</del><ins>+ if ( isset($_GET['delete_all']) || isset($_GET['delete_all2']) ) {
</ins><span class="cx"> $post_status = $wpdb->escape($_GET['post_status']);
</span><span class="cx"> $post_ids = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_type='post' AND post_status = '$post_status'" );
</span><span class="cx"> $doaction = 'delete';
</span><span class="lines">@@ -166,15 +166,15 @@
</span><span class="cx">
</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><del>- unset($_GET['deleted']);
</del><ins>+ unset($_GET['trashed']);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset($_GET['untrashed']) && (int) $_GET['untrashed'] ) {
</span><del>- printf( _n( 'Post removed from the trash.', '%s posts removed from the trash.', $_GET['untrashed'] ), number_format_i18n( $_GET['untrashed'] ) );
</del><ins>+ printf( _n( 'Post restored from the trash.', '%s posts restored from the trash.', $_GET['untrashed'] ), number_format_i18n( $_GET['untrashed'] ) );
</ins><span class="cx"> unset($_GET['undeleted']);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-$_SERVER['REQUEST_URI'] = remove_query_arg( array('locked', 'skipped', 'updated', 'deleted'), $_SERVER['REQUEST_URI'] );
</del><ins>+$_SERVER['REQUEST_URI'] = remove_query_arg( array('locked', 'skipped', 'updated', 'deleted', 'trashed', 'untrashed'), $_SERVER['REQUEST_URI'] );
</ins><span class="cx"> ?>
</span><span class="cx"> </p></div>
</span><span class="cx"> <?php } ?>
</span><span class="lines">@@ -232,12 +232,14 @@
</span><span class="cx"> 'current' => $_GET['paged']
</span><span class="cx"> ));
</span><span class="cx">
</span><ins>+$is_trash = isset($_GET['post_status']) && $_GET['post_status'] == 'trash';
+
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <div class="alignleft actions">
</span><span class="cx"> <select name="action">
</span><span class="cx"> <option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option>
</span><del>-<?php if ($_GET['post_status'] == 'trash') { ?>
</del><ins>+<?php if ( $is_trash ) { ?>
</ins><span class="cx"> <option value="untrash"><?php _e('Restore'); ?></option>
</span><span class="cx"> <option value="delete"><?php _e('Delete Permanently'); ?></option>
</span><span class="cx"> <?php } else { ?>
</span><span class="lines">@@ -289,7 +291,7 @@
</span><span class="cx"> <input type="submit" id="post-query-submit" value="<?php esc_attr_e('Filter'); ?>" class="button-secondary" />
</span><span class="cx"> <?php }
</span><span class="cx">
</span><del>-if ( $_GET['post_status'] == 'trash' && current_user_can('edit_others_posts') ) { ?>
</del><ins>+if ( $is_trash && current_user_can('edit_others_posts') ) { ?>
</ins><span class="cx"> <input type="submit" name="delete_all" id="delete_all" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
</span><span class="cx"> <?php } ?>
</span><span class="cx"> </div>
</span><span class="lines">@@ -325,7 +327,7 @@
</span><span class="cx"> <div class="alignleft actions">
</span><span class="cx"> <select name="action2">
</span><span class="cx"> <option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option>
</span><del>-<?php if ( $_GET['post_status'] == 'trash' ) { ?>
</del><ins>+<?php if ( $is_trash ) { ?>
</ins><span class="cx"> <option value="untrash"><?php _e('Restore'); ?></option>
</span><span class="cx"> <option value="delete"><?php _e('Delete Permanently'); ?></option>
</span><span class="cx"> <?php } else { ?>
</span><span class="lines">@@ -334,7 +336,7 @@
</span><span class="cx"> <?php } ?>
</span><span class="cx"> </select>
</span><span class="cx"> <input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
</span><del>-<?php if ( $_GET['post_status'] == 'trash' && current_user_can('edit_others_posts') ) { ?>
</del><ins>+<?php if ( $is_trash && current_user_can('edit_others_posts') ) { ?>
</ins><span class="cx"> <input type="submit" name="delete_all2" id="delete_all2" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
</span><span class="cx"> <?php } ?>
</span><span class="cx"> <br class="clear" />
</span></span></pre>
</div>
</div>
</body>
</html>