diff --git a/wp-admin/install.php b/wp-admin/install.php index 8d7e947a8f..6858661662 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -193,6 +193,12 @@ if ( ! is_string( $wpdb->base_prefix ) || '' === $wpdb->base_prefix ) { die( '

' . __( 'Configuration Error' ) . '

' . __( 'Your wp-config.php file has an empty database table prefix, which is not supported.' ) . '

' ); } +// 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 ) { + display_header(); + die( '

' . __( 'Configuration Error' ) . '

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

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