Ticket #19691: admin_messages_hook-2.diff

wp-admin/users.php

@@ -382 +382 @@
         </div>
 <?php endif;
 
+$messages = apply_filters( 'admin_messages', $messages );
+
 if ( ! empty($messages) ) {
         foreach ( $messages as $msg )
                 echo $msg;

wp-admin/edit-comments.php

@@ -220 +220 @@
                         }
                 }
 
+                $messages = apply_filters( 'admin_messages', $messages );
+
                 echo '<div id="moderated" class="updated"><p>' . implode( "<br/>\n", $messages ) . '</p></div>';
         }
 }

wp-admin/edit-tags.php

@@ -268 +268 @@
         printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( stripslashes($_REQUEST['s']) ) ); ?>
 </h2>
 
-<?php if ( isset($_REQUEST['message']) && ( $msg = (int) $_REQUEST['message'] ) ) : ?>
-<div id="message" class="updated"><p><?php echo $messages[$msg]; ?></p></div>
-<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
-endif; ?>
+<?php
+if ( isset($_REQUEST['message']) && ( $msg = (int) $_REQUEST['message'] ) ):
+        $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
+        $message = $messages[$msg];
+else:
+        $message = false;
+endif;
+$message_list = apply_filters( 'admin_messages', array( $message ) );
+if ( 0 != count( $message_list ) ):?>
+<div id="message" class="updated"><p><?php
+        foreach( $message_list as $message )
+                echo $message;
+?></p></div>
+<?php endif; ?>
 <div id="ajax-response"></div>
 
 <form class="search-form" action="" method="get">

wp-admin/user-new.php

@@ -231 +231 @@
         </div>
 <?php endif;
 
+$messages = apply_filters( 'admin_messages', $messages );
+
 if ( ! empty( $messages ) ) {
         foreach ( $messages as $msg )
                 echo '<div id="message" class="updated"><p>' . $msg . '</p></div>';

wp-admin/upload.php

@@ -220 +220 @@
         $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
 }
 
-if ( !empty($message) ) { ?>
-<div id="message" class="updated"><p><?php echo $message; ?></p></div>
+$message_list = apply_filters( 'admin_messages', empty( $message ) ? array() : array( $message ) );
+
+if ( 0 != count( $message_list ) ) { ?>
+        <div id="message" class="updated"><p><?php
+        foreach( $message_list as $msg )
+                echo $msg;
+?></p></div>
 <?php } ?>
 
 <?php $wp_list_table->views(); ?>

wp-admin/network/site-new.php

@@ -112 +112 @@
 <?php screen_icon('ms-admin'); ?>
 <h2 id="add-new-site"><?php _e('Add New Site') ?></h2>
 <?php
+$messages = apply_filters( 'admin_messages', $messages );
 if ( ! empty( $messages ) ) {
         foreach ( $messages as $msg )
                 echo '<div id="message" class="updated"><p>' . $msg . '</p></div>';

wp-admin/network/site-info.php

@@ -113 +113 @@
 ?>
 </h3>
 <?php
+$messages = apply_filters( 'admin_messages', $messages );
 if ( ! empty( $messages ) ) {
         foreach ( $messages as $msg )
                 echo '<div id="message" class="updated"><p>' . $msg . '</p></div>';

wp-admin/network/site-settings.php

@@ -104 +104 @@
 </h3>
 <?php
 if ( ! empty( $messages ) ) {
+        $messages = apply_filters( 'admin_messages', $messages );
         foreach ( $messages as $msg )
                 echo '<div id="message" class="updated"><p>' . $msg . '</p></div>';
 } ?>

wp-admin/network/user-new.php

@@ -74 +74 @@
 <h2 id="add-new-user"><?php _e('Add New User') ?></h2>
 <?php
 if ( ! empty( $messages ) ) {
+        $messages = apply_filters( 'admin_messages', $messages );
         foreach ( $messages as $msg )
                 echo '<div id="message" class="updated"><p>' . $msg . '</p></div>';
 }

wp-admin/nav-menus.php

@@ -473 +473 @@
         <?php screen_icon(); ?>
         <h2><?php esc_html_e('Menus'); ?></h2>
         <?php
+
+        $messages = apply_filters( 'admin_messages', $messages );
+
         foreach( $messages as $message ) :
                 echo $message . "\n";
         endforeach;

wp-admin/widgets.php

@@ -318 +318 @@
 <?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?></h2>
 
-<?php if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) { ?>
-<div id="message" class="updated"><p><?php echo $messages[$_GET['message']]; ?></p></div>
-<?php } ?>
-<?php if ( isset($_GET['error']) && isset($errors[$_GET['error']]) ) { ?>
-<div id="message" class="error"><p><?php echo $errors[$_GET['error']]; ?></p></div>
-<?php } ?>
+<?php
+if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) {
+        $message_list = apply_filters( 'admin_messages', array( $messages[$_GET['message']] ) );
+} else {
+        $message_list = array();
+}
+if ( 0 != count( $message_list ) ) {
+        echo '<div id="message" class="updated"><p>';
+        foreach( $message_list as $msg )
+                echo $msg;
+        echo '</p></div>';
+}
+if ( isset($_GET['error']) && isset($errors[$_GET['error']]) ) {
+        $error_list = apply_filters( 'error_messages', array( $errors[$_GET['error']] ) );
+} else {
+        $error_list = array();
+}
+if ( 0 != count( $message_list ) ) {
+        echo '<div id="message" class="error"><p>';
+        foreach( $error_list as $error_msg )
+                echo $error_msg;
+        echo '</p></div>';
+}
+?>
 
 <?php do_action( 'widgets_admin_page' ); ?>