Ticket #18453: 18453-2.patch

wp-admin/includes/misc.php

@@ -585 +585 @@
 </fieldset>
 <?php
 }
-?>
+
+/**
+ * Show error message only to single site admin or network admin level users
+ *
+ */  
+function _show_errors_to_admins() {
+        global $_admin_error_messages;
+
+        if ( !is_super_admin() )
+                return;
+
+        if ( !empty($_admin_error_messages) ) {
+                echo '<div class="error">';
+
+                foreach ( (array) $_admin_error_messages as $message ) {
+                        echo "<p>$message</p>\n";
+                }
+
+                echo "</div>\n";
+        }
+}
+add_action( 'admin_notices', '_show_errors_to_admins' );
+add_action( 'network_admin_notices', '_show_errors_to_admins' );
+

wp-includes/functions.php

@@ -3519 +3519 @@
  * @param string $version The version of WordPress where the message was added.
  */
 function _doing_it_wrong( $function, $message, $version ) {
+        global $_admin_error_messages;
 
         do_action( 'doing_it_wrong_run', $function, $message, $version );
 
         // Allow plugin to filter the output error trigger
         if ( WP_DEBUG && apply_filters( 'doing_it_wrong_trigger_error', true ) ) {
                 $version = is_null( $version ) ? '' : sprintf( __( '(This message was added in version %s.)' ), $version );
-                trigger_error( sprintf( __( '%1$s was called <strong>incorrectly</strong>. %2$s %3$s' ), $function, $message, $version ) );
+                $error = sprintf( __( '%1$s was called <strong>incorrectly</strong>. %2$s %3$s. For more information please install a debugging plugin like <a href="http://wordpress.org/extend/plugins/debug-bar/">Debug Bar</a> or <a href="http://wordpress.org/extend/plugins/log-deprecated-notices/">Log Deprecated Notices</a>.' ), $function, $message, $version );
+
+                if ( WP_DEBUG_DISPLAY ) {
+                        (array) $_admin_error_messages[] = $error;
+                } else {
+                        trigger_error( $error ); 
+                }
         }
 }