Refs #2543: Updated trunk mods and views to use the new functions from previous 2 commits.

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

9 files changed, 10 insertions, 10 deletions

diff --git a/pages/account/forgotten_password.php b/pages/account/forgotten_password.php
index 8ec7b6cbd..93d786e22 100644
--- a/pages/account/forgotten_password.php
+++ b/pages/account/forgotten_password.php
@@ -8,7 +8,7 @@
 
 require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 
-if (isloggedin()) {
+if (elgg_is_logged_in()) {
 	forward();
 }
 
diff --git a/pages/account/register.php b/pages/account/register.php
index 680a9f240..58544ef49 100644
--- a/pages/account/register.php
+++ b/pages/account/register.php
@@ -22,7 +22,7 @@ $friend_guid = (int) get_input('friend_guid', 0);
 $invitecode = get_input('invitecode');
 
 // only logged out people need to register
-if (isloggedin()) {
+if (elgg_is_logged_in()) {
 	forward();
 }
 
diff --git a/pages/dashboard.php b/pages/dashboard.php
index 0f4b113c5..31cc9087d 100644
--- a/pages/dashboard.php
+++ b/pages/dashboard.php
@@ -11,7 +11,7 @@ gatekeeper();
 
 // Set context and title
 elgg_set_context('dashboard');
-elgg_set_page_owner_guid(get_loggedin_userid());
+elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
 $title = elgg_echo('dashboard');
 
 // wrap intro message in a div
diff --git a/pages/friends/add.php b/pages/friends/add.php
index 81fe7b05b..1b7b0288f 100644
--- a/pages/friends/add.php
+++ b/pages/friends/add.php
@@ -14,7 +14,7 @@ $title = elgg_echo('friends:collections:add');
 $content = elgg_view_title($title);
 
 $content .= elgg_view('forms/friends/edit', array(
-	'friends' => get_user_friends(get_loggedin_userid(), "", 9999)
+	'friends' => get_user_friends(elgg_get_logged_in_user_guid(), "", 9999)
 	)
 );
 
diff --git a/pages/friends/collections.php b/pages/friends/collections.php
index 76ae9d20b..5a32b7f90 100644
--- a/pages/friends/collections.php
+++ b/pages/friends/collections.php
@@ -13,7 +13,7 @@ $title = elgg_echo('friends:collections');
 
 $content = elgg_view_title($title);
 
-$content .= elgg_view_access_collections(get_loggedin_userid());
+$content .= elgg_view_access_collections(elgg_get_logged_in_user_guid());
 
 $body = elgg_view_layout('one_sidebar', array('content' => $content));
 
diff --git a/pages/river.php b/pages/river.php
index 120ad4b57..728df50e1 100644
--- a/pages/river.php
+++ b/pages/river.php
@@ -26,12 +26,12 @@ switch ($page_type) {
 	case 'mine':
 		$title = elgg_echo('river:mine');
 		$page_filter = 'mine';
-		$options['subject_guid'] = get_loggedin_userid();
+		$options['subject_guid'] = elgg_get_logged_in_user_guid();
 		break;
 	case 'friends':
 		$title = elgg_echo('river:friends');
 		$page_filter = 'friends';
-		$options['relationship_guid'] = get_loggedin_userid();
+		$options['relationship_guid'] = elgg_get_logged_in_user_guid();
 		$options['relationship'] = 'friend';
 		break;
 	default:
diff --git a/pages/settings/account.php b/pages/settings/account.php
index 2d3edd695..e6a5da97b 100644
--- a/pages/settings/account.php
+++ b/pages/settings/account.php
@@ -11,7 +11,7 @@ gatekeeper();
 
 // Make sure we don't open a security hole ...
 if ((!elgg_get_page_owner_entity()) || (!elgg_get_page_owner_entity()->canEdit())) {
-	set_page_owner(get_loggedin_userid());
+	set_page_owner(elgg_get_logged_in_user_guid());
 }
 
 $title = elgg_echo('usersettings:user');
diff --git a/pages/settings/statistics.php b/pages/settings/statistics.php
index 5cb935e07..b7394cbe8 100644
--- a/pages/settings/statistics.php
+++ b/pages/settings/statistics.php
@@ -11,7 +11,7 @@ gatekeeper();
 
 // Make sure we don't open a security hole ...
 if ((!elgg_get_page_owner_entity()) || (!elgg_get_page_owner_entity()->canEdit())) {
-	set_page_owner(get_loggedin_userid());
+	set_page_owner(elgg_get_logged_in_user_guid());
 }
 
 $title = elgg_echo("usersettings:statistics");
diff --git a/pages/settings/tools.php b/pages/settings/tools.php
index ec0786c17..dcb026677 100644
--- a/pages/settings/tools.php
+++ b/pages/settings/tools.php
@@ -11,7 +11,7 @@ gatekeeper();
 
 // Make sure we don't open a security hole ...
 if ((!elgg_get_page_owner_entity()) || (!elgg_get_page_owner_entity()->canEdit())) {
-	set_page_owner(get_loggedin_userid());
+	set_page_owner(elgg_get_logged_in_user_guid());
 }
 
 $title = elgg_echo("usersettings:plugins");