Changeset 7885

Timestamp:

05/04/2008 05:28:42 PM (18 years ago)

Author:

westi

Message:

Always set the locale to something. Fixes #6872 props MarcoZ.

File:

• trunk/wp-includes/l10n.php (modified) (4 diffs)

trunk/wp-includes/l10n.php

@@ -39 +39 @@
 
         if (empty($locale))
-                $locale = '';
+                $locale = 'en_US';
 
         $locale = apply_filters('locale', $locale);
@@ -264 +264 @@
 function load_default_textdomain() {
         $locale = get_locale();
-        if ( empty($locale) )
-                $locale = 'en_US';
 
         $mofile = ABSPATH . LANGDIR . "/$locale.mo";
@@ -292 +290 @@
 function load_plugin_textdomain($domain, $path = false) {
         $locale = get_locale();
-        if ( empty($locale) )
-                $locale = 'en_US';
 
         if ( false === $path )
@@ -316 +312 @@
 function load_theme_textdomain($domain) {
         $locale = get_locale();
-        if ( empty($locale) )
-                $locale = 'en_US';
 
         $mofile = get_template_directory() . "/$locale.mo";