diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-08-05 11:43:38 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-08-05 11:43:38 +0000 |
| commit | 8b665b1672bcd41f285918ff7c6ce58d5d7b6e61 (patch) | |
| tree | 962306911ed6daa297c5d2669348a867b144b395 | |
| parent | 22fb608b61a4556c5636b816524a5df3e99924a7 (diff) | |
Don't set locale when installing
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@130 7be80a69-a1ef-0310-a953-fb0f7c49ff36
| -rw-r--r-- | wp-inst/wp-settings.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/wp-inst/wp-settings.php b/wp-inst/wp-settings.php index f1f17d2..7b3be96 100644 --- a/wp-inst/wp-settings.php +++ b/wp-inst/wp-settings.php @@ -186,9 +186,11 @@ require (ABSPATH . WPINC . '/version.php'); require_once( ABSPATH . WPINC . '/wpmu-functions.php' ); -$locale = get_option( "WPLANG" ); -if( $locale == false ) - $locale = get_site_option( "WPLANG" ); +if( defined( "WP_INSTALLING" ) == false ) { + $locale = get_option( "WPLANG" ); + if( $locale == false ) + $locale = get_site_option( "WPLANG" ); +} $wpdb->hide_errors(); $plugins = glob( ABSPATH . 'wp-content/mu-plugins/*.php' ); |