From 253e09f19272a71ad9a3fb2bf22066d0d090a7e2 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Thu, 10 Jul 2014 09:24:55 +0000 Subject: [PATCH] Install: Don't ask for the user's language a second time if they chose English originally. see #28577. git-svn-id: https://develop.svn.wordpress.org/trunk@29058 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/setup-config.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/wp-admin/setup-config.php b/src/wp-admin/setup-config.php index 3886f803e6..03be772166 100644 --- a/src/wp-admin/setup-config.php +++ b/src/wp-admin/setup-config.php @@ -186,10 +186,14 @@ switch($step) { if ( isset( $_REQUEST['noapi'] ) ) { $step_1 .= '&noapi'; } + if ( $loaded_language ) { $step_1 .= '&language=' . $loaded_language; $install .= '?language=' . $loaded_language; + } else { + $install .= '?language=en_US'; } + $tryagain_link = '

' . __( 'Try again' ) . ''; if ( empty( $prefix ) )