aboutsummaryrefslogtreecommitdiff
path: root/views/default/layout/shells/content
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-08 19:52:10 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-08 19:52:10 +0000
commitccb6d625239b59b283b4d3fc00da704ab743d74c (patch)
treeda9b11d8758b3007c025e4d5487410ae1ca69f68 /views/default/layout/shells/content
parent1368785a6b6f9c946dcc5eca078540bacce71f60 (diff)
downloadelgg-ccb6d625239b59b283b4d3fc00da704ab743d74c.tar.gz
elgg-ccb6d625239b59b283b4d3fc00da704ab743d74c.tar.bz2
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
Diffstat (limited to 'views/default/layout/shells/content')
-rw-r--r--views/default/layout/shells/content/filter.php4
-rw-r--r--views/default/layout/shells/content/header.php4
2 files changed, 4 insertions, 4 deletions
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(