aboutsummaryrefslogtreecommitdiff
path: root/mod/groups/actions/forums
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-05-14 16:13:56 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-05-14 16:13:56 +0000
commit2581779073b9e2029a91041c0c775de40e6b8ea8 (patch)
tree1674170ad12747958ac58c81b0d1496981502814 /mod/groups/actions/forums
parente2bcd04612f751c035ab4e331a7a2176e9f7e35b (diff)
downloadelgg-2581779073b9e2029a91041c0c775de40e6b8ea8.tar.gz
elgg-2581779073b9e2029a91041c0c775de40e6b8ea8.tar.bz2
Merge r5761:5788 from 1.7 to trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@6053 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/groups/actions/forums')
-rw-r--r--mod/groups/actions/forums/deletepost.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/mod/groups/actions/forums/deletepost.php b/mod/groups/actions/forums/deletepost.php
index 4066b7456..14336c1fa 100644
--- a/mod/groups/actions/forums/deletepost.php
+++ b/mod/groups/actions/forums/deletepost.php
@@ -24,11 +24,14 @@
//check that the user can edit as well as admin
if ($post->canEdit() || ($post->owner_guid == $_SESSION['user']->guid)) {
- //delete
+ //delete forum comment
$post->delete();
+
+ // remove river entry if it exists
+ remove_from_river_by_annotation($post_id);
+
//display confirmation message
system_message(elgg_echo("grouppost:deleted"));
-
}
} else {