From c241c16846e6e6021465d2b851791de623d8a8bd Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 1 Apr 2019 00:10:53 +0000
Subject: [PATCH] Site Health: Simplify the checks for constants that are
 always defined by default.

Props xkon.
Fixes #46738.
Built from https://develop.svn.wordpress.org/trunk@45078


git-svn-id: http://core.svn.wordpress.org/trunk@44887 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-debug-data.php | 18 +++++++++---------
 wp-includes/version.php                   |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/wp-admin/includes/class-wp-debug-data.php b/wp-admin/includes/class-wp-debug-data.php
index a49ffc2922..185c539f00 100644
--- a/wp-admin/includes/class-wp-debug-data.php
+++ b/wp-admin/includes/class-wp-debug-data.php
@@ -156,11 +156,11 @@ class WP_Debug_Data {
 			),
 			'wp-constants'        => array(
 				'label'       => __( 'WordPress Constants' ),
-				'description' => __( 'These settings are defined in your wp-config.php file, and alter where and how parts of WordPress are loaded.' ),
+				'description' => __( 'These settings alter where and how parts of WordPress are loaded.' ),
 				'fields'      => array(
 					'ABSPATH'             => array(
 						'label'   => 'ABSPATH',
-						'value'   => ( ! defined( 'ABSPATH' ) ? __( 'Undefined' ) : ABSPATH ),
+						'value'   => ABSPATH,
 						'private' => true,
 					),
 					'WP_HOME'             => array(
@@ -173,23 +173,23 @@ class WP_Debug_Data {
 					),
 					'WP_CONTENT_DIR'      => array(
 						'label' => 'WP_CONTENT_DIR',
-						'value' => ( ! defined( 'WP_CONTENT_DIR' ) ? __( 'Undefined' ) : WP_CONTENT_DIR ),
+						'value' => WP_CONTENT_DIR,
 					),
 					'WP_PLUGIN_DIR'       => array(
 						'label' => 'WP_PLUGIN_DIR',
-						'value' => ( ! defined( 'WP_PLUGIN_DIR' ) ? __( 'Undefined' ) : WP_PLUGIN_DIR ),
+						'value' => WP_PLUGIN_DIR,
 					),
 					'WP_DEBUG'            => array(
 						'label' => 'WP_DEBUG',
-						'value' => ( ! defined( 'WP_DEBUG' ) ? __( 'Undefined' ) : ( WP_DEBUG ? __( 'Enabled' ) : __( 'Disabled' ) ) ),
+						'value' => WP_DEBUG ? __( 'Enabled' ) : __( 'Disabled' ),
 					),
 					'WP_MAX_MEMORY_LIMIT' => array(
 						'label' => 'WP_MAX_MEMORY_LIMIT',
-						'value' => ( ! defined( 'WP_MAX_MEMORY_LIMIT' ) ? __( 'Undefined' ) : WP_MAX_MEMORY_LIMIT ),
+						'value' => WP_MAX_MEMORY_LIMIT,
 					),
 					'WP_DEBUG_DISPLAY'    => array(
 						'label' => 'WP_DEBUG_DISPLAY',
-						'value' => ( ! defined( 'WP_DEBUG_DISPLAY' ) ? __( 'Undefined' ) : ( WP_DEBUG_DISPLAY ? __( 'Enabled' ) : __( 'Disabled' ) ) ),
+						'value' => WP_DEBUG_DISPLAY ? __( 'Enabled' ) : __( 'Disabled' ),
 					),
 					'WP_DEBUG_LOG'        => array(
 						'label' => 'WP_DEBUG_LOG',
@@ -197,11 +197,11 @@ class WP_Debug_Data {
 					),
 					'SCRIPT_DEBUG'        => array(
 						'label' => 'SCRIPT_DEBUG',
-						'value' => ( ! defined( 'SCRIPT_DEBUG' ) ? __( 'Undefined' ) : ( SCRIPT_DEBUG ? __( 'Enabled' ) : __( 'Disabled' ) ) ),
+						'value' => SCRIPT_DEBUG ? __( 'Enabled' ) : __( 'Disabled' ),
 					),
 					'WP_CACHE'            => array(
 						'label' => 'WP_CACHE',
-						'value' => ( ! defined( 'WP_CACHE' ) ? __( 'Undefined' ) : ( WP_CACHE ? __( 'Enabled' ) : __( 'Disabled' ) ) ),
+						'value' => WP_CACHE ? __( 'Enabled' ) : __( 'Disabled' ),
 					),
 					'CONCATENATE_SCRIPTS' => array(
 						'label' => 'CONCATENATE_SCRIPTS',
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 7c3158e538..69fabda352 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.2-beta1-45077';
+$wp_version = '5.2-beta1-45078';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.