From b10c5f4233401937eb1ce5ef3672f8ce24dcd6a7 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Tue, 4 Mar 2003 15:10:37 +0000
Subject: [PATCH] - Small improvement to locale_init().
---
includes/common.inc | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/includes/common.inc b/includes/common.inc
index 4dbcd9cdab7c..0e8139d79fe9 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -138,7 +138,13 @@ function message_throttle() {
function locale_init() {
global $languages, $user;
- return ($languages ? (($user->uid && $user->language) ? $user->language : key($languages)) : 0);
+
+ if ($user->uid && $languages[$user->language]) {
+ return $user->language;
+ }
+ else {
+ return key($languages);
+ }
}
function t($string, $args = 0) {
@@ -937,4 +943,4 @@ function page_footer() {
// initialize theme:
$theme = theme_init();
-?>
\ No newline at end of file
+?>
--
GitLab