From 9962fa1f0bdfa608bf13e9ad961e597759fd980f Mon Sep 17 00:00:00 2001
From: westi <westi@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sun, 4 May 2008 17:28:42 +0000
Subject: [PATCH] Always set the locale to something. Fixes #6872 props MarcoZ.

git-svn-id: http://svn.automattic.com/wordpress/trunk@7885 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/l10n.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php
index 0584f9daa..232f4cca4 100644
--- 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);