From 0cac41db2e10b2938343c8d0ce8874dffe2a08f6 Mon Sep 17 00:00:00 2001 From: desrosj Date: Tue, 20 Sep 2022 02:24:12 +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. Built from https://develop.svn.wordpress.org/trunk@54239 git-svn-id: http://core.svn.wordpress.org/trunk@53798 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-debug-data.php | 2 +- wp-includes/load.php | 2 +- wp-includes/version.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-admin/includes/class-wp-debug-data.php b/wp-admin/includes/class-wp-debug-data.php index ab0926d3ac..67d79b9369 100644 --- a/wp-admin/includes/class-wp-debug-data.php +++ b/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/wp-includes/load.php b/wp-includes/load.php index d4bc58b9c2..f927fd3e4f 100644 --- a/wp-includes/load.php +++ b/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; } diff --git a/wp-includes/version.php b/wp-includes/version.php index 1c1b76f998..83ba3f1159 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.1-alpha-54238'; +$wp_version = '6.1-alpha-54239'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.