diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-10-10 11:25:04 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-10-10 11:25:04 +0000 |
| commit | ee66b743ce7a5df18d37b4deb34d469aac1d2b5f (patch) | |
| tree | 95f0fe9b56f6a0d4765d60ded87b5190e14c909f /wp-includes/l10n.php | |
| parent | 7f7fe629378369f9e6851ca88b49da98537a5e3e (diff) | |
| download | wordpress-mu-ee66b743ce7a5df18d37b4deb34d469aac1d2b5f.tar.gz wordpress-mu-ee66b743ce7a5df18d37b4deb34d469aac1d2b5f.tar.xz wordpress-mu-ee66b743ce7a5df18d37b4deb34d469aac1d2b5f.zip | |
Revert to pristine wporg code.
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@800 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/l10n.php')
| -rw-r--r-- | wp-includes/l10n.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php index a29bf26..b2b099c 100644 --- a/wp-includes/l10n.php +++ b/wp-includes/l10n.php @@ -6,15 +6,11 @@ function get_locale() { return $locale; // WPLANG is defined in wp-config. - if ( defined('WPLANG') && '' != WPLANG ) + if (defined('WPLANG')) $locale = WPLANG; - else if ( is_admin() ) - $locale = get_user_lang_code(); - else - $locale = get_blog_lang_code(); if (empty($locale)) - $locale = 'en'; + $locale = 'en_US'; $locale = apply_filters('locale', $locale); |