2 files changed, 7 insertions, 19 deletions
diff --git a/actions/comments/add.php b/actions/comments/add.php
index fde0a6f55..5bd741413 100644
--- a/actions/comments/add.php
+++ b/actions/comments/add.php
@@ -21,7 +21,7 @@ if (!$entity) {
 	forward(REFERER);
 }
 
-$user = get_loggedin_user();
+$user = elgg_get_logged_in_user_entity();
 
 $annotation = create_annotation($entity->guid,
 								'generic_comment',
@@ -56,7 +56,7 @@ if ($entity->owner_guid != $user->guid) {
 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(REFERER);
diff --git a/actions/comments/delete.php b/actions/comments/delete.php
index d0f5c7b84..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(REFERER);
 \ No newline at end of file