Changeset 18752

Timestamp:

09/22/2011 09:15:45 AM (13 years ago)

Author:

westi

Message:

Revert [18747] until we can discuss it further. See #18453.

Location:

trunk

Files:

• wp-admin/includes/misc.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)

trunk/wp-admin/includes/misc.php

@@ -585 +585 @@
 <?php
 }
-
-/**
- * Show error message only to single site admins or network admins
- *
- */  
-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' );
-
+?>

trunk/wp-includes/functions.php

@@ -3523 +3523 @@
  */
 function _doing_it_wrong( $function, $message, $version ) {
-    global $_admin_error_messages;
 
     do_action( 'doing_it_wrong_run', $function, $message, $version );
@@ -3530 +3529 @@
     if ( WP_DEBUG && apply_filters( 'doing_it_wrong_trigger_error', true ) ) {
         $version = is_null( $version ) ? '' : sprintf( __( '(This message was added in version %s.)' ), $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 ); 
-        }
+        trigger_error( sprintf( __( '%1$s was called <strong>incorrectly</strong>. %2$s %3$s' ), $function, $message, $version ) );
     }
 }