diff options
| author | Sem <sembrestels@riseup.net> | 2012-12-07 23:55:12 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-12-07 23:55:12 +0100 |
| commit | 3ed289b03fa3d851fd7fffbc0441ebc9b5e98310 (patch) | |
| tree | b2c8d2d7f569f0e3e7bfa6711cef96f806aea9f1 /engine/lib/access.php | |
| parent | 2b2af5392f0daadc22a1db04aa17c17d4dd37c65 (diff) | |
| parent | ccf7abb4b2b94781f9b67a6cf8798994aa1cca0d (diff) | |
| download | elgg-3ed289b03fa3d851fd7fffbc0441ebc9b5e98310.tar.gz elgg-3ed289b03fa3d851fd7fffbc0441ebc9b5e98310.tar.bz2 | |
Merge tag '1.8.11' of git://github.com/Elgg/Elgg
Elgg 1.8.11 release
Diffstat (limited to 'engine/lib/access.php')
| -rw-r--r-- | engine/lib/access.php | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/engine/lib/access.php b/engine/lib/access.php index e8b3b0d52..3b2b7aeaa 100644 --- a/engine/lib/access.php +++ b/engine/lib/access.php @@ -88,11 +88,7 @@ function get_access_array($user_id = 0, $site_id = 0, $flush = false) { // @todo everything from the db is cached. // this cache might be redundant. But db cache is flushed on every db write. - static $access_array; - - if (!isset($access_array)) { - $access_array = array(); - } + static $access_array = array(); if ($user_id == 0) { $user_id = elgg_get_logged_in_user_guid(); @@ -476,7 +472,7 @@ function can_edit_access_collection($collection_id, $user_guid = null) { return false; } - $write_access = get_write_access_array($user->getGUID(), null, true); + $write_access = get_write_access_array($user->getGUID(), 0, true); // don't ignore access when checking users. if ($user_guid) { @@ -560,8 +556,6 @@ function create_access_collection($name, $owner_guid = 0, $site_guid = 0) { * @see remove_user_from_access_collection() */ function update_access_collection($collection_id, $members) { - global $CONFIG; - $acl = get_access_collection($collection_id); if (!$acl) { @@ -1018,6 +1012,7 @@ function elgg_override_permissions($hook, $type, $value, $params) { */ function access_test($hook, $type, $value, $params) { global $CONFIG; + $value[] = $CONFIG->path . 'engine/tests/api/access_collections.php'; return $value; } |