From f2f99f39852302540310894c2dac4bd88e54eee3 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Tue, 20 Sep 2022 02:22:49 +0000 Subject: [PATCH] Bootstrap/Load: Confirm the value of `WP_ENVIRONMENT_TYPE` before using. This adjusts the check for the presence of the `WP_ENVIRONMENT_TYPE` constant to also confirm it is set to a non-empty value before using. Props dd32, khokansardar, ramon-fincken. Fixes #55741. git-svn-id: https://develop.svn.wordpress.org/trunk@54239 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/class-wp-debug-data.php | 2 +- src/wp-includes/load.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wp-admin/includes/class-wp-debug-data.php b/src/wp-admin/includes/class-wp-debug-data.php index ab0926d3ac..67d79b9369 100644 --- a/src/wp-admin/includes/class-wp-debug-data.php +++ b/src/wp-admin/includes/class-wp-debug-data.php @@ -236,7 +236,7 @@ class WP_Debug_Data { } // Check WP_ENVIRONMENT_TYPE. - if ( defined( 'WP_ENVIRONMENT_TYPE' ) ) { + if ( defined( 'WP_ENVIRONMENT_TYPE' ) && WP_ENVIRONMENT_TYPE ) { $wp_environment_type = WP_ENVIRONMENT_TYPE; } else { $wp_environment_type = __( 'Undefined' ); diff --git a/src/wp-includes/load.php b/src/wp-includes/load.php index d4bc58b9c2..f927fd3e4f 100644 --- a/src/wp-includes/load.php +++ b/src/wp-includes/load.php @@ -227,7 +227,7 @@ function wp_get_environment_type() { } // Fetch the environment from a constant, this overrides the global system variable. - if ( defined( 'WP_ENVIRONMENT_TYPE' ) ) { + if ( defined( 'WP_ENVIRONMENT_TYPE' ) && WP_ENVIRONMENT_TYPE ) { $current_env = WP_ENVIRONMENT_TYPE; }