From bd9b25afbb77176eec679eeab1f67e3f79c86913 Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Wed, 9 May 2018 22:52:21 +0000 Subject: [PATCH] Upgrade/Install: Correctly internationalise error messages during config setup. Fixes #43997 Built from https://develop.svn.wordpress.org/trunk@43205 git-svn-id: http://core.svn.wordpress.org/trunk@43034 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/setup-config.php | 4 ++-- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php index f09ecdf6f1..2382357d84 100644 --- a/wp-admin/setup-config.php +++ b/wp-admin/setup-config.php @@ -273,12 +273,12 @@ switch ( $step ) { $tryagain_link = '

' . __( 'Try again' ) . ''; if ( empty( $prefix ) ) { - wp_die( __( 'ERROR: "Table Prefix" must not be empty.' . $tryagain_link ) ); + wp_die( __( 'ERROR: "Table Prefix" must not be empty.' ) . $tryagain_link ); } // Validate $prefix: it can only contain letters, numbers and underscores. if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) { - wp_die( __( 'ERROR: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) ); + wp_die( __( 'ERROR: "Table Prefix" can only contain numbers, letters, and underscores.' ) . $tryagain_link ); } // Test the db connection. diff --git a/wp-includes/version.php b/wp-includes/version.php index d1c3b46688..a4d502f933 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '5.0-alpha-43203'; +$wp_version = '5.0-alpha-43205'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.