aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/group.php
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-08 19:27:58 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-08 19:27:58 +0000
commit1368785a6b6f9c946dcc5eca078540bacce71f60 (patch)
tree1aa0857127ef2f21cc2e64a608d94359da172bab /engine/lib/group.php
parent9074f002ad0603014c90b12aaaf2c51d740638e9 (diff)
downloadelgg-1368785a6b6f9c946dcc5eca078540bacce71f60.tar.gz
elgg-1368785a6b6f9c946dcc5eca078540bacce71f60.tar.bz2
Refs #2543: Core uses the new functions from previous commit.
git-svn-id: http://code.elgg.org/elgg/trunk@8078 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/group.php')
-rw-r--r--engine/lib/group.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/lib/group.php b/engine/lib/group.php
index 7b3f76e27..f3314ada6 100644
--- a/engine/lib/group.php
+++ b/engine/lib/group.php
@@ -261,14 +261,14 @@ function group_gatekeeper($forward = true) {
if ($group instanceof ElggGroup) {
$url = $group->getURL();
if (
- ((!isloggedin()) && (!$group->isPublicMembership())) ||
- ((!$group->isMember(get_loggedin_user()) && (!$group->isPublicMembership())))
+ ((!elgg_is_logged_in()) && (!$group->isPublicMembership())) ||
+ ((!$group->isMember(elgg_get_logged_in_user_entity()) && (!$group->isPublicMembership())))
) {
$allowed = false;
}
// Admin override
- if (isadminloggedin()) {
+ if (elgg_is_admin_logged_in()) {
$allowed = true;
}
}