aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-03-06 11:24:51 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-03-06 11:24:51 +0000
commite70fe87c24c1447705d798ee89f10a46f245e54a (patch)
treecc432371302f832f39219b90c0d97efd2b23bba0 /engine
parent5e4d72b3e2f3ca473bdaf86038f133e046cec50c (diff)
downloadelgg-e70fe87c24c1447705d798ee89f10a46f245e54a.tar.gz
elgg-e70fe87c24c1447705d798ee89f10a46f245e54a.tar.bz2
Closes #838: Missing set from static var.
git-svn-id: https://code.elgg.org/elgg/trunk@3108 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/languages.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/engine/lib/languages.php b/engine/lib/languages.php
index ca1711380..71ed57bcf 100644
--- a/engine/lib/languages.php
+++ b/engine/lib/languages.php
@@ -107,7 +107,9 @@
static $CURRENT_LANGUAGE;
if ((!$CURRENT_LANGUAGE) && (!$language))
- $CURRENT_LANGUAGE = $language = get_language();
+ $CURRENT_LANGUAGE = $language = get_language();
+ else
+ $language = $CURRENT_LANGUAGE;
if (isset($CONFIG->translations[$language][$message_key])) {
return $CONFIG->translations[$language][$message_key];