diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/lib/access.php | 8 | ||||
| -rw-r--r-- | engine/tests/api/entity_getter_functions.php | 11 |
2 files changed, 6 insertions, 13 deletions
diff --git a/engine/lib/access.php b/engine/lib/access.php index 4c448721f..d9c241e7a 100644 --- a/engine/lib/access.php +++ b/engine/lib/access.php @@ -373,9 +373,9 @@ function get_write_access_array($user_id = 0, $site_id = 0, $flush = false) { $query .= " AND (ag.owner_guid = {$user_id})"; $query .= " AND ag.id >= 3"; - $tmp_access_array = array( ACCESS_PRIVATE => elgg_echo("PRIVATE"), - ACCESS_FRIENDS => elgg_echo("access:friends:label"), - ACCESS_LOGGED_IN => elgg_echo("LOGGED_IN"), + $tmp_access_array = array( ACCESS_PRIVATE => elgg_echo("PRIVATE"), + ACCESS_FRIENDS => elgg_echo("access:friends:label"), + ACCESS_LOGGED_IN => elgg_echo("LOGGED_IN"), ACCESS_PUBLIC => elgg_echo("PUBLIC")); if ($collections = get_data($query)) { foreach($collections as $collection) { @@ -489,7 +489,7 @@ function update_access_collection($collection_id, $members) { function delete_access_collection($collection_id) { $collection_id = (int) $collection_id; - $collections = get_write_access_array(); + $collections = get_write_access_array(null, null, TRUE); $params = array('collection_id' => $collection_id); if (!trigger_plugin_hook('access:collections:deletecollection', 'collection', $params, true)) { diff --git a/engine/tests/api/entity_getter_functions.php b/engine/tests/api/entity_getter_functions.php index 579b3cea0..d09f1066d 100644 --- a/engine/tests/api/entity_getter_functions.php +++ b/engine/tests/api/entity_getter_functions.php @@ -25,19 +25,14 @@ class ElggCoreEntityGetterFunctionsTest extends ElggCoreUnitTest { 'object' => array(), 'user' => array(), 'group' => array(), - //'site' => array() + //'site' => array() ); // sites are a bit wonky. Don't use them just now. $this->types = array('object', 'user', 'group'); // create some fun objects to play with. - // one with no subtype -// $e = new ElggObject(); -// $e->subtype = $subtype; -// $e->save(); - - // and 5 with random subtypes + // 5 with random subtypes for ($i=0; $i<5; $i++) { $subtype = "test_object_subtype_" . rand(); $e = new ElggObject(); @@ -74,10 +69,8 @@ class ElggCoreEntityGetterFunctionsTest extends ElggCoreUnitTest { */ public function tearDown() { //$this->swallowErrors(); - foreach ($this->entities as $e) { $e->delete(); - unset($this->entities); } } |