Postpone warnings when WP_DEBUG and WP_DEBUG_DISPLAY are set, see #18453
git-svn-id: https://develop.svn.wordpress.org/trunk@18747 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
c0682ee59b
commit
033ed78e03
|
@ -584,4 +584,27 @@ foreach ( $_wp_admin_css_colors as $color => $color_info ): ?>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<?php
|
<?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' );
|
||||||
|
|
||||||
|
|
|
@ -3520,13 +3520,20 @@ function _deprecated_argument( $function, $version, $message = null ) {
|
||||||
* @param string $version The version of WordPress where the message was added.
|
* @param string $version The version of WordPress where the message was added.
|
||||||
*/
|
*/
|
||||||
function _doing_it_wrong( $function, $message, $version ) {
|
function _doing_it_wrong( $function, $message, $version ) {
|
||||||
|
global $_admin_error_messages;
|
||||||
|
|
||||||
do_action( 'doing_it_wrong_run', $function, $message, $version );
|
do_action( 'doing_it_wrong_run', $function, $message, $version );
|
||||||
|
|
||||||
// Allow plugin to filter the output error trigger
|
// Allow plugin to filter the output error trigger
|
||||||
if ( WP_DEBUG && apply_filters( 'doing_it_wrong_trigger_error', true ) ) {
|
if ( WP_DEBUG && apply_filters( 'doing_it_wrong_trigger_error', true ) ) {
|
||||||
$version = is_null( $version ) ? '' : sprintf( __( '(This message was added in version %s.)' ), $version );
|
$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 );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue