From 82e8acd70b5bf02c431797cf55f640f91846d7d2 Mon Sep 17 00:00:00 2001 From: Aaron Jorbin Date: Tue, 9 Jun 2015 22:00:28 +0000 Subject: [PATCH] Remove Truthy check from DO_NOT_UPGRADE_GLOBAL_TABLES Some, but not all, of the checks for DO_NOT_UPGRADE_GLOBAL_TABLES just check if it is defined, so checking for truthiness could cause the issue to not be fully fixed. In the words of Colonel Jessep: You can't handle the truth! Introduced in [32714] Fixes #32011 Built from https://develop.svn.wordpress.org/trunk@32715 git-svn-id: http://core.svn.wordpress.org/trunk@32685 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/install.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-admin/install.php b/wp-admin/install.php index 6858661662..5efebee602 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -194,7 +194,7 @@ if ( ! is_string( $wpdb->base_prefix ) || '' === $wpdb->base_prefix ) { } // Set error message if DO_NOT_UPGRADE_GLOBAL_TABLES isn't set as it will break install. -if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) && true === DO_NOT_UPGRADE_GLOBAL_TABLES ) { +if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) { display_header(); die( '

' . __( 'Configuration Error' ) . '

' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when installing WordPress.' ) . '

' ); } diff --git a/wp-includes/version.php b/wp-includes/version.php index 1cc015e57d..7fef435db7 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-alpha-32714'; +$wp_version = '4.3-alpha-32715'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.