1 files changed, 13 insertions, 40 deletions
diff --git a/mod/messageboard/actions/delete.php b/mod/messageboard/actions/delete.php
index 9c17f1fcd..a1f62278c 100644
--- a/mod/messageboard/actions/delete.php
+++ b/mod/messageboard/actions/delete.php
@@ -1,44 +1,17 @@
 <?php
+/**
+ * Elgg Message board: delete message action
+ *
+ * @package ElggMessageBoard
+ */
 
-	/**
-	 * Elgg Message board: delete message action
-	 * 
-	 * @package ElggMessageBoard
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd <info@elgg.com>
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.org/
-	 */
+$annotation_id = (int) get_input('annotation_id');
+$message = elgg_get_annotation_from_id($annotation_id);
 
-	// Ensure we're logged in
-		if (!isloggedin()) forward();
-		
-	// Make sure we can get the comment in question
-		$annotation_id = (int) get_input('annotation_id');
-		
-		//make sure that there is a message on the message board matching the passed id
-		if ($message = get_annotation($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();
-				//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);
-			}
-			
-		} else {
-			$url = "";
-			system_message(elgg_echo("messageboard:notdeleted"));
-		}
-		
-		forward($url);
+if ($message && $message->canEdit() && $message->delete()) {
+	system_message(elgg_echo("messageboard:deleted"));
+} else {
+	system_message(elgg_echo("messageboard:notdeleted"));
+}
 
-?>
-\ No newline at end of file
+forward(REFERER);