summaryrefslogtreecommitdiff
path: root/includes/common.inc
diff options
context:
space:
mode:
Diffstat (limited to 'includes/common.inc')
-rw-r--r--includes/common.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/includes/common.inc b/includes/common.inc
index b138d79b5..ce388c2e9 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -508,7 +508,9 @@ function locale_initialize() {
$languages = $languages['name'];
}
else {
- $languages = array();
+ // Ensure the locale/language is correctly returned, even without locale.module.
+ // Useful for e.g. XML/HTML 'lang' attributes.
+ $languages = array('en' => 'English');
}
if ($user->uid && $languages[$user->language]) {
return $user->language;