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.