diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-05-14 16:27:08 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-05-14 16:27:08 +0000 |
| commit | 6ba1737c22a002a71210fcd15ad36c3c2bc68402 (patch) | |
| tree | 22e44b38f986ac94ecb7d831d043d87ac687bf27 /engine/lib/actions.php | |
| parent | 368c947601348a68dd6805658e637a1e634779e5 (diff) | |
| download | elgg-6ba1737c22a002a71210fcd15ad36c3c2bc68402.tar.gz elgg-6ba1737c22a002a71210fcd15ad36c3c2bc68402.tar.bz2 | |
merge -r5832:5898 from 1.7 to trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@6055 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/actions.php')
| -rw-r--r-- | engine/lib/actions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/lib/actions.php b/engine/lib/actions.php index 304179828..66c2d9505 100644 --- a/engine/lib/actions.php +++ b/engine/lib/actions.php @@ -54,7 +54,7 @@ function action($action, $forwarder = "") { if (isset($CONFIG->actions[$action])) { if ((isadminloggedin()) || (!$CONFIG->actions[$action]['admin'])) { - if ($CONFIG->actions[$action]['public'] || $_SESSION['id'] != -1) { + if ($CONFIG->actions[$action]['public'] || get_loggedin_userid()) { // Trigger action event TODO: This is only called before the primary action is called. We need to rethink actions for 1.5 $event_result = true; |