From e3222535a07e39ffe506eb9688db515798ebf2a4 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Tue, 19 Jun 2012 19:35:55 -0400
Subject: Fixes #4606 made unlike code consistent and functional

---
 mod/likes/actions/likes/delete.php           | 17 ++++++-----------
 mod/likes/languages/en.php                   |  1 +
 mod/likes/views/default/annotation/likes.php |  4 ++--
 mod/likes/views/default/likes/button.php     |  8 +++++++-
 4 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'mod/likes')

diff --git a/mod/likes/actions/likes/delete.php b/mod/likes/actions/likes/delete.php
index db3036bb4..88cb84467 100644
--- a/mod/likes/actions/likes/delete.php
+++ b/mod/likes/actions/likes/delete.php
@@ -4,17 +4,12 @@
  *
  */
 
-$likes = elgg_get_annotations(array(
-	'guid' => (int) get_input('guid'),
-	'annotation_owner_guid' => elgg_get_logged_in_user_guid(),
-	'annotation_name' => 'likes',
-));
-if ($likes) {
-	if ($likes[0]->canEdit()) {
-		$likes[0]->delete();
-		system_message(elgg_echo("likes:deleted"));
-		forward(REFERER);
-	}
+$id = (int) get_input('id');
+$like = elgg_get_annotation_from_id($id);
+if ($like && $like->canEdit()) {
+	$like->delete();
+	system_message(elgg_echo("likes:deleted"));
+	forward(REFERER);
 }
 
 register_error(elgg_echo("likes:notdeleted"));
diff --git a/mod/likes/languages/en.php b/mod/likes/languages/en.php
index 4a98d7cfe..b9460aa10 100644
--- a/mod/likes/languages/en.php
+++ b/mod/likes/languages/en.php
@@ -17,6 +17,7 @@ $english = array(
 	'likes:userlikedthis' => '%s like',
 	'likes:userslikedthis' => '%s likes',
 	'likes:river:annotate' => 'likes',
+	'likes:delete:confirm' => 'Are you sure you want to unlike this?',
 
 	'river:likes' => 'likes %s %s',
 
diff --git a/mod/likes/views/default/annotation/likes.php b/mod/likes/views/default/annotation/likes.php
index d41522fc4..abd4df823 100644
--- a/mod/likes/views/default/annotation/likes.php
+++ b/mod/likes/views/default/annotation/likes.php
@@ -29,9 +29,9 @@ $friendlytime = elgg_view_friendly_time($like->time_created);
 
 if ($like->canEdit()) {
 	$delete_button = elgg_view("output/confirmlink",array(
-						'href' => "action/likes/delete?annotation_id={$like->id}",
+						'href' => "action/likes/delete?id={$like->id}",
 						'text' => "<span class=\"elgg-icon elgg-icon-delete float-alt\"></span>",
-						'confirm' => elgg_echo('deleteconfirm'),
+						'confirm' => elgg_echo('likes:delete:confirm'),
 						'encode_text' => false,
 					));
 }
diff --git a/mod/likes/views/default/likes/button.php b/mod/likes/views/default/likes/button.php
index bc7c8fd8a..956bbcb19 100644
--- a/mod/likes/views/default/likes/button.php
+++ b/mod/likes/views/default/likes/button.php
@@ -24,7 +24,13 @@ if (elgg_is_logged_in() && $vars['entity']->canAnnotate(0, 'likes')) {
 		);
 		$likes_button = elgg_view('output/url', $params);
 	} else {
-		$url = elgg_get_site_url() . "action/likes/delete?guid={$guid}";
+		$like = elgg_get_annotations(array(
+			'guid' => $guid,
+			'annotation_owner_guid' => elgg_get_logged_in_user_guid(),
+			'annotation_name' => 'likes',
+		));
+		$like = $like[0];
+		$url = elgg_get_site_url() . "action/likes/delete?id={$like->id}";
 		$params = array(
 			'href' => $url,
 			'text' => elgg_view_icon('thumbs-up-alt'),
-- 
cgit v1.2.3