Changeset 11779

Timestamp:

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

Author:

azaozz

Message:

Notice fixes, props mrmist, see #4529

Location:

trunk/wp-admin

Files:

• edit-comments.php (modified) (1 diff)
• edit-pages.php (modified) (6 diffs)
• edit.php (modified) (7 diffs)

trunk/wp-admin/edit-comments.php

@@ -133 +133 @@
         }
         if ( $untrashed > 0 ) {
-            printf( _n( '%s comment removed from the trash', '%s comments removed from the trash', $untrashed ), $untrashed );
+            printf( _n( '%s comment restored from the trash', '%s comments restored from the trash', $untrashed ), $untrashed );
             echo '<br />';
         }

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 } ?>

trunk/wp-admin/edit.php

@@ -25 +25 @@
     check_admin_referer('bulk-posts');
     
-    if (isset($_GET['delete_all']) || isset($_GET['delete_all2'])) {
+    if ( isset($_GET['delete_all']) || isset($_GET['delete_all2']) ) {
         $post_status = $wpdb->escape($_GET['post_status']);
         $post_ids = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_type='post' AND post_status = '$post_status'" );
@@ -167 +167 @@
 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'] ) );
-    unset($_GET['deleted']);
+    unset($_GET['trashed']);
 }
 
 if ( isset($_GET['untrashed']) && (int) $_GET['untrashed'] ) {
-    printf( _n( 'Post removed from the trash.', '%s posts removed from the trash.', $_GET['untrashed'] ), number_format_i18n( $_GET['untrashed'] ) );
+    printf( _n( 'Post restored from the trash.', '%s posts restored from the trash.', $_GET['untrashed'] ), number_format_i18n( $_GET['untrashed'] ) );
     unset($_GET['undeleted']);
 }
 
-$_SERVER['REQUEST_URI'] = remove_query_arg( array('locked', 'skipped', 'updated', 'deleted'), $_SERVER['REQUEST_URI'] );
+$_SERVER['REQUEST_URI'] = remove_query_arg( array('locked', 'skipped', 'updated', 'deleted', 'trashed', 'untrashed'), $_SERVER['REQUEST_URI'] );
 ?>
 </p></div>
@@ -233 +233 @@
 ));
 
+$is_trash = isset($_GET['post_status']) && $_GET['post_status'] == 'trash';
+
 ?>
 
@@ -238 +240 @@
 <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>
@@ -290 +292 @@
 <?php }
 
-if ( $_GET['post_status'] == 'trash' && current_user_can('edit_others_posts') ) { ?>
+if ( $is_trash && current_user_can('edit_others_posts') ) { ?>
 <input type="submit" name="delete_all" id="delete_all" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
 <?php } ?>
@@ -326 +328 @@
 <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>
@@ -335 +337 @@
 </select>
 <input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
-<?php if ( $_GET['post_status'] == 'trash' && current_user_can('edit_others_posts') ) { ?>
+<?php if ( $is_trash && current_user_can('edit_others_posts') ) { ?>
 <input type="submit" name="delete_all2" id="delete_all2" value="<?php esc_attr_e('Empty Trash'); ?>" class="button-secondary apply" />
 <?php } ?>