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

2 files changed, 3 insertions, 3 deletions

diff --git a/views/default/page/elements/content_header.php b/views/default/page/elements/content_header.php
index 6383c2f18..becf4a13a 100644
--- a/views/default/page/elements/content_header.php
+++ b/views/default/page/elements/content_header.php
@@ -18,7 +18,7 @@
  */
 
 $page_owner = elgg_get_page_owner_entity();
-$logged_in_user = get_loggedin_user();
+$logged_in_user = elgg_get_logged_in_user_entity();
 $username = $logged_in_user->username;
 
 if (!$page_owner) {
@@ -61,7 +61,7 @@ $title = elgg_echo($type);
 $title = '<div class="content-header-title">' . elgg_view_title($title) . '</div>';
 
 // must be logged in to see any action buttons
-if (isloggedin()) {
+if (elgg_is_logged_in()) {
 	// only show the new button when not on the add form.
 	// hide the tabs when on the add form.
 	if ($filter_context == 'action') {
diff --git a/views/default/page/elements/topbar.php b/views/default/page/elements/topbar.php
index 40306fcc3..6981d7d7a 100644
--- a/views/default/page/elements/topbar.php
+++ b/views/default/page/elements/topbar.php
@@ -4,7 +4,7 @@
  * The standard elgg top toolbar
  */
 
-$user = get_loggedin_user();
+$user = elgg_get_logged_in_user_entity();
 if (!elgg_instanceof($user, 'user')) {
 	// do not show tobpar to logged out users
 	return true;