Fixes #4115 returning bool from remove_user_from_access_collection()

diff --git a/engine/lib/access.php b/engine/lib/access.php
index ba3820f4611840ef77ca7a235b08ebc573b258eb..08b9283cde590371c6713224dcc508b12cdb3566 100644 (file)
--- a/engine/lib/access.php
+++ b/engine/lib/access.php
@@ -717,7 +717,7 @@ function remove_user_from_access_collection($user_guid, $collection_id) {
                WHERE access_collection_id = {$collection_id}
                        AND user_guid = {$user_guid}";
 
-       return delete_data($q);
+       return (bool)delete_data($q);
 }
 
 /**

diff --git a/engine/tests/api/access_collections.php b/engine/tests/api/access_collections.php
index 7875b14095554707d2c9fb71c340118f7fd8b886..bea995a6e9eade52216e073cacd20d7efdd36469 100644 (file)
--- a/engine/tests/api/access_collections.php
+++ b/engine/tests/api/access_collections.php
@@ -88,7 +88,7 @@ class ElggCoreAccessCollectionsTest extends ElggCoreUnitTest {
 
                if ($result) {
                        $result = remove_user_from_access_collection($this->user->guid, $acl_id);
-                       $this->assertTrue($result);
+                       $this->assertIdentical(true, $result);
                }
 
                delete_access_collection($acl_id);