aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-07-31 17:43:16 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-07-31 17:43:16 +0000
commit5824a36ba715d76820aa66f38f4cc617973a6a15 (patch)
treef765cccf1c999881f6c9104da24cb1e60876a67f
parenta4d6c4c90bd16cc18da76b842d51b64c7b3a486a (diff)
downloadelgg-5824a36ba715d76820aa66f38f4cc617973a6a15.tar.gz
elgg-5824a36ba715d76820aa66f38f4cc617973a6a15.tar.bz2
Collections now delete successfully
git-svn-id: https://code.elgg.org/elgg/trunk@1641 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--actions/friends/deletecollection.php6
-rw-r--r--languages/en.php6
2 files changed, 6 insertions, 6 deletions
diff --git a/actions/friends/deletecollection.php b/actions/friends/deletecollection.php
index 3d389e6c2..f47ac50e9 100644
--- a/actions/friends/deletecollection.php
+++ b/actions/friends/deletecollection.php
@@ -22,7 +22,7 @@
if($get_collection){
- if(array_pop($get_collection)->owner_guid == $_SESSION['user']->getGUID()){
+ if($get_collection->owner_guid == $_SESSION['user']->getGUID()){
$delete_collection = delete_access_collection($collection_id);
@@ -32,14 +32,14 @@
} else {
// Failure message
- system_message(elgg_echo("friends:collectiondeletefailed"));
+ register_error(elgg_echo("friends:collectiondeletefailed"));
}
} else {
// Failure message
- system_message(elgg_echo("friends:collectiondeletefailed"));
+ register_error(elgg_echo("friends:collectiondeletefailed"));
}
diff --git a/languages/en.php b/languages/en.php
index 8d6e80fd5..484bee1cf 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -216,9 +216,9 @@
'friends:collectionfriends' => "Friends in collection",
'friends:collectionedit' => "Edit this collection",
'friends:nocollections' => "You do not yet have any collections.",
- 'friends:collectiondeleted' => "That collection has been deleted.",
- 'friends:collectiondeletefailed' => "We were unable to delete that collection, either you don't have permission, or some other problem has occurred.",
- 'friends:collectionadded' => "Your collection was successful created",
+ 'friends:collectiondeleted' => "Your collection has been deleted.",
+ 'friends:collectiondeletefailed' => "We were unable to delete the collection. Either you don't have permission, or some other problem has occurred.",
+ 'friends:collectionadded' => "Your collection was successfuly created",
'friends:nocollectionname' => "You need to give your collection a name before it can be created.",
'friends:river:created' => "%s added the friends widget.",