diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-06-12 20:23:51 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-06-12 20:23:51 +0000 |
| commit | 9c6eb2dae8143d7b615d213869bca4b5b2456a98 (patch) | |
| tree | e2ad4b7d84642fcb35fedbf81e79c1cb2a6a6005 /engine/lib/users.php | |
| parent | 365e4fb08bbc5449d32e25e09face877afee4366 (diff) | |
| download | elgg-9c6eb2dae8143d7b615d213869bca4b5b2456a98.tar.gz elgg-9c6eb2dae8143d7b615d213869bca4b5b2456a98.tar.bz2 | |
Merged r6362:6366 from 1.7 to trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@6469 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/users.php')
| -rw-r--r-- | engine/lib/users.php | 6 |
1 files changed, 4 insertions, 2 deletions
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); |