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

westi · westi · commit e668d3e40447 · 2008-05-04T17:28:42.000Z
git-svn-id: https://develop.svn.wordpress.org/trunk@7885 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php
@@ -38,7 +38,7 @@ function get_locale() {
 		$locale = WPLANG;
 
 	if (empty($locale))
-		$locale = '';
+		$locale = 'en_US';
 
 	$locale = apply_filters('locale', $locale);
 
@@ -263,8 +263,6 @@ function load_textdomain($domain, $mofile) {
  */
 function load_default_textdomain() {
 	$locale = get_locale();
-	if ( empty($locale) )
-		$locale = 'en_US';
 
 	$mofile = ABSPATH . LANGDIR . "/$locale.mo";
 
@@ -291,8 +289,6 @@ function load_default_textdomain() {
  */
 function load_plugin_textdomain($domain, $path = false) {
 	$locale = get_locale();
-	if ( empty($locale) )
-		$locale = 'en_US';
 
 	if ( false === $path )
 		$path = PLUGINDIR;
@@ -315,8 +311,6 @@ function load_plugin_textdomain($domain, $path = false) {
  */
 function load_theme_textdomain($domain) {
 	$locale = get_locale();
-	if ( empty($locale) )
-		$locale = 'en_US';
 
 	$mofile = get_template_directory() . "/$locale.mo";
 	load_textdomain($domain, $mofile);
