1 files changed, 5 insertions, 24 deletions
diff --git a/mod/messageboard/actions/delete.php b/mod/messageboard/actions/delete.php
index 1cc20f285..a40329cb5 100644
--- a/mod/messageboard/actions/delete.php
+++ b/mod/messageboard/actions/delete.php
@@ -1,37 +1,18 @@
 <?php
-
 /**
  * Elgg Message board: delete message action
  *
  * @package ElggMessageBoard
  */
 
-// Make sure we can get the comment in question
 $annotation_id = (int) get_input('annotation_id');
+$message = elgg_get_annotation_from_id($annotation_id);
 
-//make sure that there is a message on the message board matching the passed id
-if ($message = elgg_get_annotation_from_id($annotation_id)) {
-
-	//grab the user or group entity
-	$entity = get_entity($message->entity_guid);
-
-	//check to make sure the current user can actually edit the message board
-	if ($message->canEdit()) {
-		//delete the comment
-		$message->delete();
-		// delete river entry
-		remove_from_river_by_annotation($annotation_id);
-		//display message
-		system_message(elgg_echo("messageboard:deleted"));
-		//generate the url to forward to
-		$url = "pg/messageboard/" . $entity->username;
-		//forward the user back to their message board
-		forward($url);
-	}
-
+if ($message && $message->canEdit() && $message->delete()) {
+	remove_from_river_by_annotation($annotation_id);
+	system_message(elgg_echo("messageboard:deleted"));
 } else {
-	$url = "";
 	system_message(elgg_echo("messageboard:notdeleted"));
 }
 
-forward($url);
+forward(REFERER);