aboutsummaryrefslogtreecommitdiff
path: root/mod/likes/views
diff options
context:
space:
mode:
authorcash <cash.costello@gmail.com>2012-06-19 19:35:55 -0400
committercash <cash.costello@gmail.com>2012-06-19 19:35:55 -0400
commite3222535a07e39ffe506eb9688db515798ebf2a4 (patch)
tree08eb754915cbbff4deac64a4707b2515dc1bdbaf /mod/likes/views
parentd71309056037adc869319566f9ec53313eb192d8 (diff)
downloadelgg-e3222535a07e39ffe506eb9688db515798ebf2a4.tar.gz
elgg-e3222535a07e39ffe506eb9688db515798ebf2a4.tar.bz2
Fixes #4606 made unlike code consistent and functional
Diffstat (limited to 'mod/likes/views')
-rw-r--r--mod/likes/views/default/annotation/likes.php4
-rw-r--r--mod/likes/views/default/likes/button.php8
2 files changed, 9 insertions, 3 deletions
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'),