From ca08eb6d170d375ef4fca53604956f3474c7db19 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sun, 22 Aug 2010 22:37:30 +0000
Subject: Merged r6701:6756 from 1.7 branch into trunk

git-svn-id: http://code.elgg.org/elgg/trunk@6849 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 actions/user/language.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'actions/user/language.php')

diff --git a/actions/user/language.php b/actions/user/language.php
index 1165b196e..83cc10dbd 100644
--- a/actions/user/language.php
+++ b/actions/user/language.php
@@ -8,16 +8,13 @@
  * @link http://elgg.org/
  */
 
-global $CONFIG;
-
 gatekeeper();
 
 $language = get_input('language');
 $user_id = get_input('guid');
-$user = "";
 
 if (!$user_id) {
-	$user = $_SESSION['user'];
+	$user = get_loggedin_user();
 } else {
 	$user = get_entity($user_id);
 }
-- 
cgit v1.2.3