Changeset 59155 for trunk/src/wp-admin/includes/class-wp-debug-data.php

Timestamp:

10/01/2024 05:57:49 PM (2 months ago)

Author:

SergeyBiryukov

Message:

Site Health: Adjust display of the DB_COLLATE and WP_ENVIRONMENT_TYPE constants.

Includes:

• Simplifying the logic and bringing some consistency to how the values are checked and displayed.
• Correcting the debug value for DB_COLLATE. This should be the actual contents of the constant, and empty if it is indeed empty, as the debug data that's copied and shared should represent the raw value, and does not need to be in a user-readable format.

Follow-up to [45782], [52021], [54239], [59147].

Props Clorith, SergeyBiryukov.
See #58265.

File:

• trunk/src/wp-admin/includes/class-wp-debug-data.php (modified) (3 diffs)

trunk/src/wp-admin/includes/class-wp-debug-data.php

@@ -1333 +1333 @@
 
         // Check WP_ENVIRONMENT_TYPE.
-        if ( defined( 'WP_ENVIRONMENT_TYPE' ) && WP_ENVIRONMENT_TYPE ) {
-            $wp_environment_type = WP_ENVIRONMENT_TYPE;
+        if ( defined( 'WP_ENVIRONMENT_TYPE' ) ) {
+            $wp_environment_type       = WP_ENVIRONMENT_TYPE ? WP_ENVIRONMENT_TYPE : __( 'Empty value' );
+            $wp_environment_type_debug = WP_ENVIRONMENT_TYPE;
         } else {
-            $wp_environment_type = __( 'Undefined' );
+            $wp_environment_type       = __( 'Undefined' );
+            $wp_environment_type_debug = 'undefined';
         }
 
         // Check DB_COLLATE.
-        if ( defined( 'DB_COLLATE' ) && DB_COLLATE ) {
-            $wp_db_collate = DB_COLLATE;
-        } elseif ( defined( 'DB_COLLATE' ) && empty( DB_COLLATE ) ) {
-            $wp_db_collate = __( 'Defined, but empty' );
+        if ( defined( 'DB_COLLATE' ) ) {
+            $db_collate       = DB_COLLATE ? DB_COLLATE : __( 'Empty value' );
+            $db_collate_debug = DB_COLLATE;
         } else {
-            $wp_db_collate = __( 'Undefined' );
+            $db_collate       = __( 'Undefined' );
+            $db_collate_debug = 'undefined';
         }
 
@@ -1423 +1425 @@
                 'label' => 'WP_ENVIRONMENT_TYPE',
                 'value' => $wp_environment_type,
-                'debug' => $wp_environment_type,
+                'debug' => $wp_environment_type_debug,
             ),
             'WP_DEVELOPMENT_MODE' => array(
@@ -1437 +1439 @@
             'DB_COLLATE'          => array(
                 'label' => 'DB_COLLATE',
-                'value' => $wp_db_collate,
-                'debug' => $wp_db_collate,
+                'value' => $db_collate,
+                'debug' => $db_collate_debug,
             ),
         );