diff options
author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-08 19:52:10 +0000 |
---|---|---|
committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-08 19:52:10 +0000 |
commit | ccb6d625239b59b283b4d3fc00da704ab743d74c (patch) | |
tree | da9b11d8758b3007c025e4d5487410ae1ca69f68 /mod/profile | |
parent | 1368785a6b6f9c946dcc5eca078540bacce71f60 (diff) | |
download | elgg-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 'mod/profile')
-rw-r--r-- | mod/profile/start.php | 2 | ||||
-rwxr-xr-x | mod/profile/views/default/profile/owner_block.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mod/profile/start.php b/mod/profile/start.php index 2a12bce48..21f7a8c05 100644 --- a/mod/profile/start.php +++ b/mod/profile/start.php @@ -50,7 +50,7 @@ function profile_page_handler($page) { } // short circuit if invalid or banned username - if (!$user || ($user->isBanned() && !isadminloggedin())) { + if (!$user || ($user->isBanned() && !elgg_is_admin_logged_in())) { register_error(elgg_echo('profile:notfound')); forward(); } diff --git a/mod/profile/views/default/profile/owner_block.php b/mod/profile/views/default/profile/owner_block.php index 4edcec8d1..e36658004 100755 --- a/mod/profile/views/default/profile/owner_block.php +++ b/mod/profile/views/default/profile/owner_block.php @@ -25,7 +25,7 @@ $actions = elgg_get_array_value('action', $menu, array()); $admin = elgg_get_array_value('admin', $menu, array()); $profile_actions = ''; -if (isloggedin() && $actions) { +if (elgg_is_logged_in() && $actions) { $profile_actions = '<ul class="elgg-menu">'; foreach ($actions as $action) { $profile_actions .= '<li>' . $action->getLink(array('class' => 'elgg-action-button')) . '</li>'; @@ -35,7 +35,7 @@ if (isloggedin() && $actions) { // if admin, display admin links $admin_links = ''; -if (isadminloggedin() && get_loggedin_userid() != elgg_get_page_owner_guid()) { +if (elgg_is_admin_logged_in() && elgg_get_logged_in_user_guid() != elgg_get_page_owner_guid()) { $admin_links = '<ul class="profile-admin-menu-wrapper">'; $admin_links .= '<li><a class="elgg-toggle" id="elgg-toggler-admin-menu">Admin options…</a>'; $admin_links .= '<ul class="profile-admin-menu" id="elgg-togglee-admin-menu">'; |