sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Administration: Give the $error variable in wp-admin/admin-header.php a more descriptive name.

Browse Source 
This avoids a conflict with the same global variable used elsewhere, e.g. in Theme Editor.

Follow-up to [48850].

Props vinayak.anivase.
Merges [48938] to the 5.5 branch.
Fixes #51219.

git-svn-id: https://develop.svn.wordpress.org/branches/5.5@48955 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2020-09-07 13:03:42 +00:00
parent 10a0ec4651
commit b3e77f3bbd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wp-admin/admin-header.php
View File

@ -198,18 +198,18 @@ if ( $current_screen->is_block_editor() ) {
} }
} }
$error = error_get_last(); $error_get_last = error_get_last();
// Print a CSS class to make PHP errors visible. // Print a CSS class to make PHP errors visible.
if ( $error && WP_DEBUG && WP_DEBUG_DISPLAY && ini_get( 'display_errors' ) if ( $error_get_last && WP_DEBUG && WP_DEBUG_DISPLAY && ini_get( 'display_errors' )
// Don't print the class for PHP notices in wp-config.php, as they happen before WP_DEBUG takes effect, // Don't print the class for PHP notices in wp-config.php, as they happen before WP_DEBUG takes effect,
// and should not be displayed with the `error_reporting` level previously set in wp-load.php. // and should not be displayed with the `error_reporting` level previously set in wp-load.php.
&& ( E_NOTICE !== $error['type'] || 'wp-config.php' !== wp_basename( $error['file'] ) ) && ( E_NOTICE !== $error_get_last['type'] || 'wp-config.php' !== wp_basename( $error_get_last['file'] ) )
) { ) {
$admin_body_class .= ' php-error'; $admin_body_class .= ' php-error';
} }
unset( $error ); unset( $error_get_last );
?> ?>
</head> </head>