diff options
Diffstat (limited to 'includes/common.inc')
| -rw-r--r-- | includes/common.inc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/includes/common.inc b/includes/common.inc index 4dbcd9cda..0e8139d79 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 @@ $locale = locale_init(); // initialize theme: $theme = theme_init(); -?>
\ No newline at end of file +?> |