Revert "Merged ACL fixes from 1.7 branch."

This reverts commit de111da23258cd2b513c8f4ab84712ee50272b23. Reverted because of problems in how 1.8 populates the access dropdown.

1 files changed, 6 insertions, 14 deletions

diff --git a/actions/friends/collections/edit.php b/actions/friends/collections/edit.php
index 581b21353..b7fb716f2 100644
--- a/actions/friends/collections/edit.php
+++ b/actions/friends/collections/edit.php
@@ -1,23 +1,15 @@
 <?php
 /**
- * Elgg collection add page
+ * Friends collection edit action
  *
- * @package Elgg
- * @subpackage Core
+ * @package Elgg.Core
+ * @subpackage Friends.Collections
  */
 
 $collection_id = get_input('collection_id');
 $friends = get_input('friend');
 
-// check it exists and we can edit
-if (!can_edit_access_collection($collection_id)) {
-	system_message(elgg_echo('friends:collection:edit_failed'));
-}
+//chech the collection exists and the current user owners it
+update_access_collection($collection_id, $friends);
 
-if (update_access_collection($collection_id, $friends)) {
-	system_message(elgg_echo('friends:collections:edited'));
-} else {
-	system_message(elgg_echo('friends:collection:edit_failed'));
-}
-
-forward(REFERER);
\ No newline at end of file
+exit;