1 files changed, 62 insertions, 58 deletions
diff --git a/actions/comments/add.php b/actions/comments/add.php
index ea3b0326e..5bd741413 100644
--- a/actions/comments/add.php
+++ b/actions/comments/add.php
@@ -1,58 +1,62 @@
-<?php
-
-	/**
-	 * Elgg add 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/
-	 */
-
-	// Make sure we're logged in; forward to the front page if not
-		gatekeeper();
-		action_gatekeeper();
-		
-	// Get input
-		$entity_guid = (int) get_input('entity_guid');
-		$comment_text = get_input('generic_comment');
-		
-	// Let's see if we can get an entity with the specified GUID
-		if ($entity = get_entity($entity_guid)) {
-			
-	        // If posting the comment was successful, say so
-				if ($entity->annotate('generic_comment',$comment_text,$entity->access_id, $_SESSION['guid'])) {
-					
-					if ($entity->owner_guid != $_SESSION['user']->getGUID())
-					notify_user($entity->owner_guid, $_SESSION['user']->getGUID(), elgg_echo('generic_comment:email:subject'), 
-						sprintf(
-									elgg_echo('generic_comment:email:body'),
-									$entity->title,
-									$_SESSION['user']->name,
-									$comment_text,
-									$entity->getURL(),
-									$_SESSION['user']->name,
-									$_SESSION['user']->getURL()
-								)
-					); 
-					
-					system_message(elgg_echo("generic_comment:posted"));
-					//add to river
-					add_to_river('annotation/annotate','comment',$_SESSION['user']->guid,$entity->guid);
-
-					
-				} else {
-					register_error(elgg_echo("generic_comment:failure"));
-				}
-				
-		} else {
-		
-			register_error(elgg_echo("generic_comment:notfound"));
-			
-		}
-		
-	// Forward to the 
-		forward($entity->getURL());
-
-?>
-\ No newline at end of file
+<?php
+/**
+ * Elgg add comment action
+ *
+ * @package Elgg.Core
+ * @subpackage Comments
+ */
+
+$entity_guid = (int) get_input('entity_guid');
+$comment_text = get_input('generic_comment');
+
+if (empty($comment_text)) {
+	register_error(elgg_echo("generic_comment:blank"));
+	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(REFERER);
+}
+
+$user = elgg_get_logged_in_user_entity();
+
+$annotation = create_annotation($entity->guid,
+								'generic_comment',
+								$comment_text,
+								"",
+								$user->guid,
+								$entity->access_id);
+
+// tell user annotation posted
+if (!$annotation) {
+	register_error(elgg_echo("generic_comment:failure"));
+	forward(REFERER);
+}
+
+// notify if poster wasn't owner
+if ($entity->owner_guid != $user->guid) {
+
+	notify_user($entity->owner_guid,
+				$user->guid,
+				elgg_echo('generic_comment:email:subject'),
+				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('river/annotation/generic_comment/create', 'comment', $user->guid, $entity->guid, "", 0, $annotation);
+
+// Forward to the page the action occurred on
+forward(REFERER);