From 5e2a75ef29d28b8b395133e8f4e2779a04b694a5 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Thu, 3 Sep 2020 01:41:47 +0000 Subject: [PATCH] Administration: Give the `$error` variable in `wp-admin/admin-header.php` a more descriptive name. This avoids a conflict with the same global variable used elsewhere, e.g. in Theme Editor. Follow-up to [48850]. Props vinayak.anivase. Fixes #51219. git-svn-id: https://develop.svn.wordpress.org/trunk@48938 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/admin-header.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wp-admin/admin-header.php b/src/wp-admin/admin-header.php index 7c59ec0baf..35b1686b51 100644 --- a/src/wp-admin/admin-header.php +++ b/src/wp-admin/admin-header.php @@ -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. -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, // 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'; } -unset( $error ); +unset( $error_get_last ); ?>