1 files changed, 18 insertions, 35 deletions
diff --git a/actions/comments/delete.php b/actions/comments/delete.php
index 76c29449a..c6b481da4 100644
--- a/actions/comments/delete.php
+++ b/actions/comments/delete.php
@@ -1,35 +1,18 @@
-<?php
-
-	/**
-	 * Elgg delete comment action
-	 * 
-	 * @package Elgg
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider <curverider.co.uk>
-	 * @copyright Curverider Ltd 2008-2009
-	 * @link http://elgg.org/
-	 */
-
-	// Ensure we're logged in
-		if (!isloggedin()) forward();
-		
-	// Make sure we can get the comment in question
-		$annotation_id = (int) get_input('annotation_id');
-		if ($comment = get_annotation($annotation_id)) {
-    		
-    		$entity = get_entity($comment->entity_guid);
-			
-			if ($comment->canEdit()) {
-				$comment->delete();
-				system_message(elgg_echo("generic_comment:deleted"));
-				forward($entity->getURL());
-			}
-			
-		} else {
-			$url = "";
-		}
-		
-		register_error(elgg_echo("generic_comment:notdeleted"));
-		forward($entity->getURL());
-
-?>
-\ No newline at end of file
+<?php
+/**
+ * Elgg delete comment action
+ *
+ * @package Elgg
+ */
+
+// Make sure we can get the comment in question
+$annotation_id = (int) get_input('annotation_id');
+$comment = elgg_get_annotation_from_id($annotation_id);
+if ($comment && $comment->canEdit()) {
+	$comment->delete();
+	system_message(elgg_echo("generic_comment:deleted"));
+} else {
+	register_error(elgg_echo("generic_comment:notdeleted"));
+}
+
+forward(REFERER);
+\ No newline at end of file