diff options
| author | Evan Winslow <evan@elgg.org> | 2012-07-21 15:23:42 -0700 |
|---|---|---|
| committer | Evan Winslow <evan@elgg.org> | 2012-07-21 15:23:42 -0700 |
| commit | 3cb2ce976fc024dfc700ef4500e5cddd01163e9c (patch) | |
| tree | edb4a9320d7d499b66832cfa5cf1a5548cad80fb | |
| parent | b164c39ac5c82b311e9ef07fa01fcc464bab86b1 (diff) | |
| download | elgg-3cb2ce976fc024dfc700ef4500e5cddd01163e9c.tar.gz elgg-3cb2ce976fc024dfc700ef4500e5cddd01163e9c.tar.bz2 | |
Revert "Fixes #4606 made unlike code consistent and functional"
This reverts commit e3222535a07e39ffe506eb9688db515798ebf2a4.
| -rw-r--r-- | mod/likes/actions/likes/delete.php | 17 | ||||
| -rw-r--r-- | mod/likes/languages/en.php | 1 | ||||
| -rw-r--r-- | mod/likes/views/default/annotation/likes.php | 4 | ||||
| -rw-r--r-- | mod/likes/views/default/likes/button.php | 8 |
4 files changed, 14 insertions, 16 deletions
diff --git a/mod/likes/actions/likes/delete.php b/mod/likes/actions/likes/delete.php index 88cb84467..db3036bb4 100644 --- a/mod/likes/actions/likes/delete.php +++ b/mod/likes/actions/likes/delete.php @@ -4,12 +4,17 @@ * */ -$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); +$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); + } } register_error(elgg_echo("likes:notdeleted")); diff --git a/mod/likes/languages/en.php b/mod/likes/languages/en.php index b9460aa10..4a98d7cfe 100644 --- a/mod/likes/languages/en.php +++ b/mod/likes/languages/en.php @@ -17,7 +17,6 @@ $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 abd4df823..d41522fc4 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?id={$like->id}", + 'href' => "action/likes/delete?annotation_id={$like->id}", 'text' => "<span class=\"elgg-icon elgg-icon-delete float-alt\"></span>", - 'confirm' => elgg_echo('likes:delete:confirm'), + 'confirm' => elgg_echo('deleteconfirm'), 'encode_text' => false, )); } diff --git a/mod/likes/views/default/likes/button.php b/mod/likes/views/default/likes/button.php index 956bbcb19..bc7c8fd8a 100644 --- a/mod/likes/views/default/likes/button.php +++ b/mod/likes/views/default/likes/button.php @@ -24,13 +24,7 @@ if (elgg_is_logged_in() && $vars['entity']->canAnnotate(0, 'likes')) { ); $likes_button = elgg_view('output/url', $params); } else { - $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}"; + $url = elgg_get_site_url() . "action/likes/delete?guid={$guid}"; $params = array( 'href' => $url, 'text' => elgg_view_icon('thumbs-up-alt'), |