aboutsummaryrefslogtreecommitdiff
path: root/actions/comments/add.php
diff options
context:
space:
mode:
Diffstat (limited to 'actions/comments/add.php')
-rw-r--r--actions/comments/add.php14
1 files changed, 4 insertions, 10 deletions
diff --git a/actions/comments/add.php b/actions/comments/add.php
index b7feb4b66..5bd741413 100644
--- a/actions/comments/add.php
+++ b/actions/comments/add.php
@@ -6,14 +6,9 @@
* @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(REFERER);
@@ -26,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',
@@ -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(REFERER);