From f750cdf33e7717fdb4fc6caf72361e76385fd6ae Mon Sep 17 00:00:00 2001
From: marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 26 Jun 2008 12:44:22 +0000
Subject: Closes #92: Settings: Set user language
 http://trac.elgg.org/elgg/ticket/92

git-svn-id: https://code.elgg.org/elgg/trunk@1145 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/languages.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'engine/lib/languages.php')

diff --git a/engine/lib/languages.php b/engine/lib/languages.php
index be3cf6e54..781fe2e6e 100644
--- a/engine/lib/languages.php
+++ b/engine/lib/languages.php
@@ -57,7 +57,10 @@
 		function elgg_echo($message_key, $language = "") {
 			
 			global $CONFIG;
-			
+
+			if ((empty($language)) && ($_SESSION['user']->language))
+				$language = $_SESSION['user']->language;
+	
 			if ((empty($language)) && (isset($CONFIG->language)))
 				$language = $CONFIG->language;
 				
-- 
cgit v1.2.3