WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Install: Don't ask for the user's language a second time if they chose English originally. 

see #28577.

Built from https://develop.svn.wordpress.org/trunk@29058


git-svn-id: http://core.svn.wordpress.org/trunk@28846 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2014-07-10 09:25:15 +00:00
parent 1899cc9c41
commit 21eb687bb3
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/setup-config.php
View File

@ -186,10 +186,14 @@ switch($step) {
if ( isset( $_REQUEST['noapi'] ) ) { if ( isset( $_REQUEST['noapi'] ) ) {
$step_1 .= '&noapi'; $step_1 .= '&noapi';
} }
if ( $loaded_language ) { if ( $loaded_language ) {
$step_1 .= '&language=' . $loaded_language; $step_1 .= '&language=' . $loaded_language;
$install .= '?language=' . $loaded_language; $install .= '?language=' . $loaded_language;
} else {
$install .= '?language=en_US';
} }
$tryagain_link = '</p><p class="step"><a href="' . $step_1 . '" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>'; $tryagain_link = '</p><p class="step"><a href="' . $step_1 . '" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>';
if ( empty( $prefix ) ) if ( empty( $prefix ) )