Files missed from previous commit.

git-svn-id: http://code.elgg.org/elgg/trunk@5509 36083f99-b078-4883-b0ff-0f9b5a30f544

2 files changed, 71 insertions, 71 deletions

diff --git a/actions/likes/add.php b/actions/likes/add.php
index 36672d3ec..526d46225 100644
--- a/actions/likes/add.php
+++ b/actions/likes/add.php
@@ -1,64 +1,62 @@
-<?php

-/**

- * Elgg add like action

- *

- * @package Elgg

- * @author Curverider <curverider.co.uk>

- * @link http://elgg.org/

- */

-

-// Make sure we're logged in; forward to the front page if not

-gatekeeper();

-

-// Get input

-$entity_guid = (int) get_input('guid');

-//check to see if the user has already liked the item

-if(elgg_already_created_annotation($entity_guid, 'likes')){

-	system_message(elgg_echo("likes:alreadyliked"));

-	forward($_SERVER['HTTP_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("likes:notfound"));

-	forward($_SERVER['HTTP_REFERER']);

-}

-

-$user = get_loggedin_user();

-$annotation = create_annotation($entity->guid, 

-								'likes',

-								"likes", 

-								"", 

-								$user->guid, 

-								$entity->access_id);

-

-// tell user annotation didn't work if that is the case

-if (!$annotation) {

-	register_error(elgg_echo("likes:failure"));

-	forward($_SERVER['HTTP_REFERER']);

-}

-

-// notify if poster wasn't owner

-if ($entity->owner_guid != $user->guid) {

-			

-	notify_user($entity->owner_guid,

-				$user->guid,

-				elgg_echo('likes:email:subject'),

-				sprintf(

-					elgg_echo('likes:email:body'),

-					$entity->title,

-					$user->name,

-					$comment_text,

-					$entity->getURL(),

-					$user->name,

-					$user->getURL()

-				)

-			);

-}

-

-system_message(elgg_echo("likes:likes"));

-//add to river

-add_to_river('annotation/annotatelike','likes',$user->guid,$entity->guid, "", 0, $annotation);

-

-// Forward back to the page where the user 'liked' the object

-forward($_SERVER['HTTP_REFERER']);

+<?php
+/**
+ * Elgg add like action
+ *
+ * @package Elgg
+ * @author Curverider <curverider.co.uk>
+ * @link http://elgg.org/
+ */
+
+gatekeeper();
+$entity_guid = (int) get_input('guid');
+
+//check to see if the user has already liked the item
+if (elgg_annotation_exists($entity_guid, 'likes')){
+	system_message(elgg_echo("likes:alreadyliked"));
+	forward($_SERVER['HTTP_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("likes:notfound"));
+	forward($_SERVER['HTTP_REFERER']);
+}
+
+$user = get_loggedin_user();
+$annotation = create_annotation($entity->guid,
+								'likes',
+								"likes",
+								"",
+								$user->guid,
+								$entity->access_id);
+
+// tell user annotation didn't work if that is the case
+if (!$annotation) {
+	register_error(elgg_echo("likes:failure"));
+	forward($_SERVER['HTTP_REFERER']);
+}
+
+// notify if poster wasn't owner
+if ($entity->owner_guid != $user->guid) {
+
+	notify_user($entity->owner_guid,
+				$user->guid,
+				elgg_echo('likes:email:subject'),
+				sprintf(
+					elgg_echo('likes:email:body'),
+					$entity->title,
+					$user->name,
+					$comment_text,
+					$entity->getURL(),
+					$user->name,
+					$user->getURL()
+				)
+			);
+}
+
+system_message(elgg_echo("likes:likes"));
+//add to river
+add_to_river('annotation/annotatelike','likes',$user->guid,$entity->guid, "", 0, $annotation);
+
+// Forward back to the page where the user 'liked' the object
+forward($_SERVER['HTTP_REFERER']);
diff --git a/views/default/likes/forms/edit.php b/views/default/likes/forms/edit.php
index 10bb7aada..76e503f55 100644
--- a/views/default/likes/forms/edit.php
+++ b/views/default/likes/forms/edit.php
@@ -8,20 +8,22 @@
  *
  * @uses $vars['entity']
  */
-	 
-if (isset($vars['entity']) && isloggedin()) { 
+
+if (isset($vars['entity']) && isloggedin()) {
 	$guid = $vars['entity']->getGuid();
 	$url = elgg_add_action_tokens_to_url($vars['url'] . "action/likes/add?guid={$guid}");
 	//check to see if the user has already liked
-	if(!elgg_already_created_annotation($guid, 'likes'))
-		echo "<a href=\"{$url}\">" . elgg_echo('likes:likethis') . "</a><br />";	 	
+	if (!elgg_annotation_exists($guid, 'likes')) {
+		echo "<a href=\"{$url}\">" . elgg_echo('likes:likethis') . "</a><br />";
+	}
 	//display the number of likes
 	$numoflikes = elgg_count_likes($vars['entity']);
-	if($numoflikes != 0){
-		if($numoflikes == 1)
+	if ($numoflikes != 0) {
+		if ($numoflikes == 1) {
 			echo "<a onclick=\" $('#showLikes').show('slow');\">" . elgg_count_likes($vars['entity']) . " " . elgg_echo('likes:userlikedthis') . "</a>";
-		else
+		} else {
 			echo "<a onclick=\" $('#showLikes').show('slow');\">" . elgg_count_likes($vars['entity']) . " " . elgg_echo('likes:userslikethis') . "</a>";
+		}
 	}
 	//show the users who liked the object
 	echo "<div id=\"showLikes\" style=\"display:none;\">";