Merged r6757:6810 from 1.7 branch into trunk

git-svn-id: http://code.elgg.org/elgg/trunk@6850 36083f99-b078-4883-b0ff-0f9b5a30f544

3 files changed, 5 insertions, 5 deletions

diff --git a/views/default/usersettings/plugins_opt/plugin.php b/views/default/usersettings/plugins_opt/plugin.php
index d32e44283..79286ec90 100644
--- a/views/default/usersettings/plugins_opt/plugin.php
+++ b/views/default/usersettings/plugins_opt/plugin.php
@@ -20,7 +20,7 @@ $manifest = $details['manifest'];
 
 $user_guid = $details['user_guid'];
 if ($user_guid) {
-	$user_guid = $_SESSION['user']->guid;
+	$user_guid = get_loggedin_userid();
 }
 
 if (elgg_view("usersettings/{$plugin}/edit")) {
diff --git a/views/default/usersettings/statistics_opt/numentities.php b/views/default/usersettings/statistics_opt/numentities.php
index 1c4b127ec..ee38bdfee 100644
--- a/views/default/usersettings/statistics_opt/numentities.php
+++ b/views/default/usersettings/statistics_opt/numentities.php
@@ -9,7 +9,7 @@
  */
 
 // Get entity statistics
-$entity_stats = get_entity_statistics($_SESSION['user']->guid);
+$entity_stats = get_entity_statistics(get_loggedin_userid());
 
 if ($entity_stats) {
 ?>
diff --git a/views/default/usersettings/statistics_opt/online.php b/views/default/usersettings/statistics_opt/online.php
index 817b18cde..e176aaf9f 100644
--- a/views/default/usersettings/statistics_opt/online.php
+++ b/views/default/usersettings/statistics_opt/online.php
@@ -8,13 +8,13 @@
  * @link http://elgg.org/
  */
 
-$user = $_SESSION['user'];
+$user = get_loggedin_user();
 
 $logged_in = 0;
-$log = get_system_log($_SESSION['user']->guid, "login", "", 'user', '', 1);
+$log = get_system_log($user->guid, "login", "", 'user', '', 1);
 
 if ($log) {
-	$logged_in=$log[0]->time_created;
+	$logged_in = $log[0]->time_created;
 }
 
 ?>