Changes in trunk/wp-admin/edit-pages.php [12162:12308]

File:

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

trunk/wp-admin/edit-pages.php

@@ -142 +142 @@
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?> <a href="page-new.php" class="button add-new-h2"><?php esc_html_e('Add New'); ?></a> <?php
+<h2><?php echo esc_html( $title ); ?> <a href="page-new.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'page'); ?></a> <?php
 if ( isset($_GET['s']) && $_GET['s'] )
     printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( get_search_query() ) ); ?>
@@ -168 +168 @@
     printf( _n( 'Page moved to the trash.', '%s pages moved to the trash.', $_GET['trashed'] ), number_format_i18n( $_GET['trashed'] ) );
     $ids = isset($_GET['ids']) ? $_GET['ids'] : 0;
-    echo ' <a href="' . esc_url( wp_nonce_url( "edit-pages.php?doaction=undo&action=untrash&ids=$ids", "bulk-pages" ) ) . '">' . __('Undo?') . '</a><br />';
+    echo ' <a href="' . esc_url( wp_nonce_url( "edit-pages.php?doaction=undo&action=untrash&ids=$ids", "bulk-pages" ) ) . '">' . __('Undo') . '</a><br />';
     unset($_GET['trashed']);
 }
@@ -199 +199 @@
     $class = '';
 
-    if ( !in_array($status, $avail_post_stati) )
+    if ( !in_array($status, $avail_post_stati) || $num_posts->$status <= 0 )
         continue;