diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/lib/access.php | 5 | ||||
| -rw-r--r-- | engine/lib/users.php | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/engine/lib/access.php b/engine/lib/access.php index fc5081ced..b8d8820e1 100644 --- a/engine/lib/access.php +++ b/engine/lib/access.php @@ -628,7 +628,7 @@ function get_user_access_collections($owner_guid, $site_guid = 0) { * @param true|false $idonly If set to true, will only return the members' IDs (default: false) * @return ElggUser entities if successful, false if not */ -function get_members_of_access_collection($collection, $idonly = false) { +function get_members_of_access_collection($collection, $idonly = FALSE) { global $CONFIG; $collection = (int)$collection; @@ -638,6 +638,9 @@ function get_members_of_access_collection($collection, $idonly = false) { } else { $query = "SELECT e.guid FROM {$CONFIG->dbprefix}access_collection_membership m JOIN {$CONFIG->dbprefix}entities e ON e.guid = m.user_guid WHERE m.access_collection_id = {$collection}"; $collection_members = get_data($query); + if (!$collection_members) { + return FALSE; + } foreach($collection_members as $key => $val) { $collection_members[$key] = $val->guid; } diff --git a/engine/lib/users.php b/engine/lib/users.php index 118a96b32..fcc10133f 100644 --- a/engine/lib/users.php +++ b/engine/lib/users.php @@ -754,8 +754,10 @@ function user_remove_friend($user_guid, $friend_guid) { // perform cleanup for access lists. $collections = get_user_access_collections($user_guid); - foreach ($collections as $collection) { - remove_user_from_access_collection($friend_guid, $collection->id); + if ($collections) { + foreach ($collections as $collection) { + remove_user_from_access_collection($friend_guid, $collection->id); + } } return remove_entity_relationship($user_guid, "friend", $friend_guid); |