Changeset 48851 for branches/5.5

Timestamp:

08/24/2020 10:48:24 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Administration: Don't print the .php-error class in the admin header for PHP notices in wp-config.php.

Any notices in that file happen before WP_DEBUG takes effect, and should not be displayed with the error_reporting level previously set in wp-load.php.

Adding the class when there is no notice displayed results in extra padding under the admin bar, which should be avoided.

Follow-up to [20102], [21025], [26620], [47745].

Props akissz, tw2113, laxman-prajapati, sabernhardt, johnbillion, SergeyBiryukov.
Merges [48850] to the 5.5 branch.
Fixes #51073.

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();
+
 // Print a CSS class to make PHP errors visible.
-if ( error_get_last() && WP_DEBUG && WP_DEBUG_DISPLAY && ini_get( 'display_errors' ) ) {
+if ( $error && 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'] ) )
+) {
     $admin_body_class .= ' php-error';
 }
+
+unset( $error );
 
 ?>