diff options
author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-08 19:27:58 +0000 |
---|---|---|
committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-08 19:27:58 +0000 |
commit | 1368785a6b6f9c946dcc5eca078540bacce71f60 (patch) | |
tree | 1aa0857127ef2f21cc2e64a608d94359da172bab /engine/lib/actions.php | |
parent | 9074f002ad0603014c90b12aaaf2c51d740638e9 (diff) | |
download | elgg-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/actions.php')
-rw-r--r-- | engine/lib/actions.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/lib/actions.php b/engine/lib/actions.php index a93617df9..4538eda0b 100644 --- a/engine/lib/actions.php +++ b/engine/lib/actions.php @@ -86,8 +86,8 @@ function action($action, $forwarder = "") { } if (isset($CONFIG->actions[$action])) { - if (isadminloggedin() || ($CONFIG->actions[$action]['access'] !== 'admin')) { - if (isloggedin() || ($CONFIG->actions[$action]['access'] === 'public')) { + if (elgg_is_admin_logged_in() || ($CONFIG->actions[$action]['access'] !== 'admin')) { + if (elgg_is_logged_in() || ($CONFIG->actions[$action]['access'] === 'public')) { // Trigger action event // @todo This is only called before the primary action is called. @@ -433,4 +433,4 @@ function ajax_action_hook() { } } -elgg_register_event_handler('init', 'system', 'actions_init');
\ No newline at end of file +elgg_register_event_handler('init', 'system', 'actions_init'); |