2 files changed, 14 insertions, 32 deletions

diff --git a/actions/comments/add.php b/actions/comments/add.php
index 2e28e7839..5bd741413 100644
--- a/actions/comments/add.php
+++ b/actions/comments/add.php
@@ -6,27 +6,22 @@
  * @subpackage Comments
  */
 
-// Make sure we're logged in; forward to the front page if not
-gatekeeper();
-
-// Get input
 $entity_guid = (int) get_input('entity_guid');
 $comment_text = get_input('generic_comment');
 
-// make sure comment is not empty
 if (empty($comment_text)) {
 	register_error(elgg_echo("generic_comment:blank"));
-	forward($_SERVER['HTTP_REFERER']);
+	forward(REFERER);
 }
 
 // Let's see if we can get an entity with the specified GUID
 $entity = get_entity($entity_guid);
 if (!$entity) {
 	register_error(elgg_echo("generic_comment:notfound"));
-	forward($_SERVER['HTTP_REFERER']);
+	forward(REFERER);
 }
 
-$user = get_loggedin_user();
+$user = elgg_get_logged_in_user_entity();
 
 $annotation = create_annotation($entity->guid,
 								'generic_comment',
@@ -38,7 +33,7 @@ $annotation = create_annotation($entity->guid,
 // tell user annotation posted
 if (!$annotation) {
 	register_error(elgg_echo("generic_comment:failure"));
-	forward($_SERVER['HTTP_REFERER']);
+	forward(REFERER);
 }
 
 // notify if poster wasn't owner
@@ -47,22 +42,21 @@ if ($entity->owner_guid != $user->guid) {
 	notify_user($entity->owner_guid,
 				$user->guid,
 				elgg_echo('generic_comment:email:subject'),
-				sprintf(
-					elgg_echo('generic_comment:email:body'),
+				elgg_echo('generic_comment:email:body', array(
 					$entity->title,
 					$user->name,
 					$comment_text,
 					$entity->getURL(),
 					$user->name,
 					$user->getURL()
-				)
+				))
 			);
 }
 
 system_message(elgg_echo("generic_comment:posted"));
 
 //add to river
-add_to_river('annotation/annotate', 'comment', $user->guid, $entity->guid, "", 0, $annotation);
+add_to_river('river/annotation/generic_comment/create', 'comment', $user->guid, $entity->guid, "", 0, $annotation);
 
 // Forward to the page the action occurred on
-forward($_SERVER['HTTP_REFERER']);
+forward(REFERER);
diff --git a/actions/comments/delete.php b/actions/comments/delete.php
index 47c988d51..c6b481da4 100644
--- a/actions/comments/delete.php
+++ b/actions/comments/delete.php
@@ -5,26 +5,14 @@
  * @package Elgg
  */
 
-// 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());
-	}
-
+$comment = elgg_get_annotation_from_id($annotation_id);
+if ($comment && $comment->canEdit()) {
+	$comment->delete();
+	system_message(elgg_echo("generic_comment:deleted"));
 } else {
-	$url = "";
+	register_error(elgg_echo("generic_comment:notdeleted"));
 }
 
-register_error(elgg_echo("generic_comment:notdeleted"));
-forward($_SERVER['HTTP_REFERER']);
\ No newline at end of file
+forward(REFERER);
\ No newline at end of file