From 9bd5aad2c3bdb4a283d2b15ed0f91e295099c9e2 Mon Sep 17 00:00:00 2001
From: marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 14 Nov 2008 19:03:58 +0000
Subject: * Introducing get_loggedin_user() and get_loggedin_userid() * ACLs
 now using get_loggedin_user* * Some logic cleaned up * Some "Undefined..."
 messages cleaned up

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

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

diff --git a/engine/lib/languages.php b/engine/lib/languages.php
index acca80c6c..5c62eaa81 100644
--- a/engine/lib/languages.php
+++ b/engine/lib/languages.php
@@ -55,8 +55,10 @@
 	{
 		global $CONFIG;
 		
-		if ((isset($_SESSION['user'])) && ($_SESSION['user']->language))
-			$language = $_SESSION['user']->language;
+		$user = get_loggedin_user();
+		
+		if ((isset($user)) && ($user->language))
+			$language = $user->language;
 	
 		if ((empty($language)) && (isset($CONFIG->language)))
 			$language = $CONFIG->language;
@@ -78,8 +80,10 @@
 			
 			global $CONFIG;
 
-			if ((empty($language)) && (isset($_SESSION['user'])) && ($_SESSION['user']->language))
-				$language = $_SESSION['user']->language;
+			$user = get_loggedin_user();
+			
+			if ((empty($language)) && (isset($user)) && ($user->language))
+				$language = $user->language;
 	
 			if ((empty($language)) && (isset($CONFIG->language)))
 				$language = $CONFIG->language;
-- 
cgit v1.2.3