Ticket #18710: 18710.diff

wp-admin/edit.php

@@ -224 +224 @@
 
 add_screen_option( 'per_page', array( 'label' => $title, 'default' => 20, 'option' => 'edit_' . $post_type . '_per_page' ) );
 
+$counts = array(
+        0 => null,
+        1 => isset( $_REQUEST['updated'] )   ? absint( $_REQUEST['updated'] )   : 0,
+        2 => isset( $_REQUEST['locked'] )    ? absint( $_REQUEST['locked'] )    : 0,
+        3 => isset( $_REQUEST['deleted'] )   ? absint( $_REQUEST['deleted'] )   : 0,
+        4 => isset( $_REQUEST['trashed'] )   ? absint( $_REQUEST['trashed'] )   : 0,
+        5 => isset( $_REQUEST['untrashed'] ) ? absint( $_REQUEST['untrashed'] ) : 0,
+);
+
+$bulk_messages = array();
+$bulk_messages['post'] = array(
+        0 => '',
+        1 => _n( '%s post updated.', '%s posts updated.', $counts[1] ),
+        2 => _n( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $counts[2] ),
+        3 => _n( '%s post permanently deleted.', '%s posts permanently deleted.', $counts[3] ),
+        4 => _n( '%s post moved to the Trash.', '%s posts moved to the Trash.', $counts[4] ),
+        5 => _n( '%s post restored from the Trash.', '%s posts restored from the Trash.', $counts[5] ),
+);
+$bulk_messages['page'] = array(
+        0 => '',
+        1 => _n( '%s page updated.', '%s pages updated.', $counts[1] ),
+        2 => _n( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $counts[2] ),
+        3 => _n( '%s page permanently deleted.', '%s pages permanently deleted.', $counts[3] ),
+        4 => _n( '%s page moved to the Trash.', '%s pages moved to the Trash.', $counts[4] ),
+        5 => _n( '%s page restored from the Trash.', '%s pages restored from the Trash.', $counts[5] ),
+);
+
+$bulk_messages = apply_filters( 'bulk_post_updated_messages', $bulk_messages, $counts );
+unset( $counts );
+
 require_once('./admin-header.php');
 ?>
 <div class="wrap">
@@ -239 +269 @@
 <?php if ( isset( $_REQUEST['locked'] ) || isset( $_REQUEST['updated'] ) || isset( $_REQUEST['deleted'] ) || isset( $_REQUEST['trashed'] ) || isset( $_REQUEST['untrashed'] ) ) {
         $messages = array();
 ?>
-<div id="message" class="updated"><p>
 <?php if ( isset( $_REQUEST['updated'] ) && $updated = absint( $_REQUEST['updated'] ) ) {
-        $messages[] = sprintf( _n( '%s post updated.', '%s posts updated.', $updated ), number_format_i18n( $updated ) );
+
+        if ( isset( $bulk_messages[$post_type][1] ) )
+                $messages[] = sprintf( $bulk_messages[$post_type][1], number_format_i18n( $updated ) ); 
+        else if ( isset( $bulk_messages['post'][1] ) )
+                $messages[] = sprintf( $bulk_messages['post'][1], number_format_i18n( $updated ) ); 
+
 }
 
 if ( isset( $_REQUEST['locked'] ) && $locked = absint( $_REQUEST['locked'] ) ) {
-        $messages[] = sprintf( _n( '%s item not updated, somebody is editing it.', '%s items not updated, somebody is editing them.', $locked ), number_format_i18n( $locked ) );
+
+        if ( isset( $bulk_messages[$post_type][2] ) )
+                $messages[] = sprintf( $bulk_messages[$post_type][2], number_format_i18n( $locked ) ); 
+        else if ( isset( $bulk_messages['post'][2] ) )
+                $messages[] = sprintf( $bulk_messages['post'][2], number_format_i18n( $locked ) ); 
+
 }
 
 if ( isset( $_REQUEST['deleted'] ) && $deleted = absint( $_REQUEST['deleted'] ) ) {
-        $messages[] = sprintf( _n( 'Item permanently deleted.', '%s items permanently deleted.', $deleted ), number_format_i18n( $deleted ) );
+
+        if ( isset( $bulk_messages[$post_type][3] ) )
+                $messages[] = sprintf( $bulk_messages[$post_type][3], number_format_i18n( $deleted ) ); 
+        else if ( isset( $bulk_messages['post'][3] ) )
+                $messages[] = sprintf( $bulk_messages['post'][3], number_format_i18n( $deleted ) ); 
+
 }
 
 if ( isset( $_REQUEST['trashed'] ) && $trashed = absint( $_REQUEST['trashed'] ) ) {
-        $messages[] = sprintf( _n( 'Item moved to the Trash.', '%s items moved to the Trash.', $trashed ), number_format_i18n( $trashed ) );
+
+        if ( isset( $bulk_messages[$post_type][4] ) )
+                $messages[] = sprintf( $bulk_messages[$post_type][4], number_format_i18n( $trashed ) ); 
+        else if ( isset( $bulk_messages['post'][4] ) )
+                $messages[] = sprintf( $bulk_messages['post'][4], number_format_i18n( $trashed ) ); 
+
         $ids = isset($_REQUEST['ids']) ? $_REQUEST['ids'] : 0;
         $messages[] = '<a href="' . esc_url( wp_nonce_url( "edit.php?post_type=$post_type&doaction=undo&action=untrash&ids=$ids", "bulk-posts" ) ) . '">' . __('Undo') . '</a>';
+
 }
 
 if ( isset( $_REQUEST['untrashed'] ) && $untrashed = absint( $_REQUEST['untrashed'] ) ) {
-        $messages[] = sprintf( _n( 'Item restored from the Trash.', '%s items restored from the Trash.', $untrashed ), number_format_i18n( $untrashed ) );
+
+        if ( isset( $bulk_messages[$post_type][5] ) )
+                $messages[] = sprintf( $bulk_messages[$post_type][5], number_format_i18n( $untrashed ) ); 
+        else if ( isset( $bulk_messages['post'][5] ) )
+                $messages[] = sprintf( $bulk_messages['post'][5], number_format_i18n( $untrashed ) ); 
+
 }
 
 if ( $messages )
-        echo join( ' ', $messages );
+        echo '<div id="message" class="updated"><p>' . join( ' ', $messages ) . '</p></div>';
 unset( $messages );
 
 $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'locked', 'skipped', 'updated', 'deleted', 'trashed', 'untrashed' ), $_SERVER['REQUEST_URI'] );
 ?>
-</p></div>
 <?php } ?>
 
 <?php $wp_list_table->views(); ?>