Changeset 48955

Timestamp:

09/07/2020 01:03:42 PM (4 years ago)

Author:

SergeyBiryukov

Message:

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.
Merges [48938] to the 5.5 branch.
Fixes #51219.

Location:

branches/5.5

Files:

• . (modified) (1 prop)
• src/wp-admin/admin-header.php (modified) (1 diff)

branches/5.5/src/wp-admin/admin-header.php

@@ -199 +199 @@
 }
 
-$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 );
 
 ?>