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

4 files changed, 6 insertions, 6 deletions

diff --git a/views/default/layout/elements/owner_block.php b/views/default/layout/elements/owner_block.php
index 6ec4ebabe..dce4c1632 100644
--- a/views/default/layout/elements/owner_block.php
+++ b/views/default/layout/elements/owner_block.php
@@ -13,7 +13,7 @@ elgg_push_context('owner_block');
 // groups and other users get owner block
 $owner = elgg_get_page_owner_entity();
 if ($owner instanceof ElggGroup ||
-	($owner instanceof ElggUser && $owner->getGUID() != get_loggedin_userid())) {
+	($owner instanceof ElggUser && $owner->getGUID() != elgg_get_logged_in_user_guid())) {
 
 	$header = elgg_view_entity($owner, false);
 
diff --git a/views/default/layout/shells/admin.php b/views/default/layout/shells/admin.php
index 988606ec1..7d38500d7 100644
--- a/views/default/layout/shells/admin.php
+++ b/views/default/layout/shells/admin.php
@@ -30,7 +30,7 @@ $logout = elgg_view('output/url', array(
 			</a>
 		</h1>
 		<ul class="elgg-menu-user">
-			<li><?php echo elgg_echo('admin:loggedin', array(get_loggedin_user()->name)); ?></li>
+			<li><?php echo elgg_echo('admin:loggedin', array(elgg_get_logged_in_user_entity()->name)); ?></li>
 			<li><?php echo $view_site; ?></li>
 			<li><?php echo $logout; ?></li>
 		</ul>
diff --git a/views/default/layout/shells/content/filter.php b/views/default/layout/shells/content/filter.php
index d84c27a63..c9f774e72 100644
--- a/views/default/layout/shells/content/filter.php
+++ b/views/default/layout/shells/content/filter.php
@@ -16,8 +16,8 @@ if (isset($vars['filter_override'])) {
 
 $context = elgg_get_array_value('context', $vars, elgg_get_context());
 
-if (isloggedin() && $context) {
-	$username = get_loggedin_user()->username;
+if (elgg_is_logged_in() && $context) {
+	$username = elgg_get_logged_in_user_entity()->username;
 	$filter_context = elgg_get_array_value('filter_context', $vars, 'everyone');
 
 	// generate a list of default tabs
diff --git a/views/default/layout/shells/content/header.php b/views/default/layout/shells/content/header.php
index b0bab9dc9..f3517e9ad 100644
--- a/views/default/layout/shells/content/header.php
+++ b/views/default/layout/shells/content/header.php
@@ -25,12 +25,12 @@ if ($context) {
 	if (isset($vars['buttons'])) {
 		$buttons = $vars['buttons'];
 	} else {
-		if (isloggedin() && $context) {
+		if (elgg_is_logged_in() && $context) {
 			$owner = elgg_get_page_owner_entity();
 			if (elgg_instanceof($owner, 'group')) {
 				$guid = $owner->getGUID();
 			} else {
-				$guid = get_loggedin_userid();
+				$guid = elgg_get_logged_in_user_guid();
 			}
 			$new_link = elgg_get_array_value('new_link', $vars, "pg/$context/add/$guid/");
 			$params = array(