Changeset 11779 for trunk/wp-admin/edit-pages.php

Timestamp:

08/06/2009 12:40:39 AM (17 years ago)

Author:

azaozz

Message:

Notice fixes, props mrmist, see #4529

File:

• trunk/wp-admin/edit-pages.php (modified) (6 diffs)

trunk/wp-admin/edit-pages.php

@@ -169 +169 @@
 }
 if ( isset($_GET['untrashed']) && (int) $_GET['untrashed'] ) {
-        printf( _n( 'Page removed from the trash.', '%s pages removed from the trash.', $_GET['untrashed'] ), number_format_i18n( $_GET['untrashed'] ) );
+        printf( _n( 'Page restored from the trash.', '%s pages restored from the trash.', $_GET['untrashed'] ), number_format_i18n( $_GET['untrashed'] ) );
         unset($_GET['untrashed']);
 }
@@ -240 +240 @@
 ));
 
+$is_trash = isset($_GET['post_status']) && $_GET['post_status'] == 'trash';
+
 if ( $page_links ) : ?>
 <div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
@@ -252 +254 @@
 <select name="action">
 <option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<?php if ($_GET['post_status'] == 'trash') { ?>
+<?php if ( $is_trash ) { ?>
 <option value="untrash"><?php _e('Restore'); ?></option>
 <option value="delete"><?php _e('Delete Permanently'); ?></option>
@@ -262 +264 @@
 <input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
 <?php wp_nonce_field('bulk-pages'); ?>
-<?php if ($_GET['post_status'] == 'trash') { ?>
+<?php if ( $is_trash ) { ?>
 <input type="submit" name="delete_all" id="delete_all" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
 <?php } ?>
@@ -299 +301 @@
 <select name="action2">
 <option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option>
-<?php if ($_GET['post_status'] == 'trash') { ?>
+<?php if ( $is_trash ) { ?>
 <option value="untrash"><?php _e('Restore'); ?></option>
 <option value="delete"><?php _e('Delete Permanently'); ?></option>
@@ -308 +310 @@
 </select>
 <input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
-<?php if ($_GET['post_status'] == 'trash') { ?>
+<?php if ( $is_trash ) { ?>
 <input type="submit" name="delete_all2" id="delete_all2" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
 <?php } ?>