From 42d890455ae7b6a61a566d174f9980b8faee782f Mon Sep 17 00:00:00 2001
From: ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 30 Oct 2010 22:04:16 +0000
Subject: Replaced $_SESSION['id'] and $_SESSION['guid'] with
 get_loggedin_userid()

git-svn-id: http://code.elgg.org/elgg/trunk@7143 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/profile/views/default/profile/admin_menu.php                 | 2 +-
 mod/profile/views/default/profile/commentwall/commentwalladd.php | 2 +-
 mod/profile/views/default/profile/icon.php                       | 2 +-
 mod/profile/views/default/profile/menu/adminlinks.php            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'mod/profile/views')

diff --git a/mod/profile/views/default/profile/admin_menu.php b/mod/profile/views/default/profile/admin_menu.php
index a896a0ace..e901442c2 100755
--- a/mod/profile/views/default/profile/admin_menu.php
+++ b/mod/profile/views/default/profile/admin_menu.php
@@ -5,7 +5,7 @@
 global $CONFIG;
 
 if (isadminloggedin()){
-	if ($_SESSION['id']!=elgg_get_page_owner_guid()){
+	if (get_loggedin_userid()!=elgg_get_page_owner_guid()){
 		$user = get_user(elgg_get_page_owner_guid());
 		$url = $vars['url'];
 		$ts = time();
diff --git a/mod/profile/views/default/profile/commentwall/commentwalladd.php b/mod/profile/views/default/profile/commentwall/commentwalladd.php
index 0491925c6..a5765082c 100644
--- a/mod/profile/views/default/profile/commentwall/commentwalladd.php
+++ b/mod/profile/views/default/profile/commentwall/commentwalladd.php
@@ -8,7 +8,7 @@
     <!-- textarea for the contents -->
     <textarea name="message_content" value="" class="commentwall"></textarea><br />
     <!-- the person posting an item on the message board -->
-    <input type="hidden" name="guid" value="<?php echo $_SESSION['guid']; ?>"  />
+    <input type="hidden" name="guid" value="<?php echo get_loggedin_userid(); ?>"  />
     <!-- the page owner, this will be the profile owner -->
     <input type="hidden" name="pageOwner" value="<?php echo elgg_get_page_owner_guid(); ?>"  />
     <?php echo elgg_view('input/securitytoken'); ?>
diff --git a/mod/profile/views/default/profile/icon.php b/mod/profile/views/default/profile/icon.php
index 1423070d4..82404676e 100644
--- a/mod/profile/views/default/profile/icon.php
+++ b/mod/profile/views/default/profile/icon.php
@@ -76,7 +76,7 @@ if ($vars['entity'] instanceof ElggUser) {
 					}
 					
 					// if Admin is logged in, and not looking at admins own avatar menu
-					if (isadminloggedin() && ($_SESSION['id']!=$vars['entity']->guid) ){
+					if (isadminloggedin() && (get_loggedin_userid()!=$vars['entity']->guid) ){
 						$adminlinks = elgg_view('profile/menu/adminlinks', $vars);
 						if (!empty($adminlinks)) {
 							echo "<li class='user_menu_admin'>{$adminlinks}</li>";
diff --git a/mod/profile/views/default/profile/menu/adminlinks.php b/mod/profile/views/default/profile/menu/adminlinks.php
index 807fa1034..6d99613ea 100644
--- a/mod/profile/views/default/profile/menu/adminlinks.php
+++ b/mod/profile/views/default/profile/menu/adminlinks.php
@@ -8,7 +8,7 @@
  */
 
 if (isadminloggedin()){
-	if ($_SESSION['id']!=$vars['entity']->guid){
+	if (get_loggedin_userid()!=$vars['entity']->guid){
 ?>
 		<a href="<?php echo $vars['url']; ?>pg/settings/user/<?php echo $vars['entity']->username; ?>/"><?php echo elgg_echo('profile:editdetails'); ?></a>
 <?php 
-- 
cgit v1.2.3