aboutsummaryrefslogtreecommitdiff
path: root/mod/likes
diff options
context:
space:
mode:
Diffstat (limited to 'mod/likes')
-rw-r--r--mod/likes/languages/en.php2
-rw-r--r--mod/likes/manifest.xml2
-rw-r--r--mod/likes/start.php5
-rw-r--r--mod/likes/views/default/annotation/likes.php2
4 files changed, 8 insertions, 3 deletions
diff --git a/mod/likes/languages/en.php b/mod/likes/languages/en.php
index 29b379506..4a98d7cfe 100644
--- a/mod/likes/languages/en.php
+++ b/mod/likes/languages/en.php
@@ -25,7 +25,7 @@ $english = array(
'likes:notifications:body' =>
'Hi %1$s,
-%2$s likes your post "%3$s" on %4$s!
+%2$s likes your post "%3$s" on %4$s
See your original post here:
diff --git a/mod/likes/manifest.xml b/mod/likes/manifest.xml
index 5a18b8862..62835fcf5 100644
--- a/mod/likes/manifest.xml
+++ b/mod/likes/manifest.xml
@@ -8,7 +8,7 @@
<description>Enables users to like content on the site.</description>
<website>http://www.elgg.org/</website>
<copyright>See COPYRIGHT.txt</copyright>
- <license>GNU Public License version 2</license>
+ <license>GNU General Public License version 2</license>
<requires>
<type>elgg_release</type>
<version>1.8</version>
diff --git a/mod/likes/start.php b/mod/likes/start.php
index 690d7c052..0f8e12159 100644
--- a/mod/likes/start.php
+++ b/mod/likes/start.php
@@ -65,6 +65,11 @@ function likes_river_menu_setup($hook, $type, $return, $params) {
if ($item->type == "group" && $item->view != "river/group/create") {
return $return;
}
+
+ // don't like users #4116
+ if ($item->type == "user") {
+ return $return;
+ }
$object = $item->getObjectEntity();
if (!elgg_in_context('widgets') && $item->annotation_id == 0) {
diff --git a/mod/likes/views/default/annotation/likes.php b/mod/likes/views/default/annotation/likes.php
index 314d0790d..d41522fc4 100644
--- a/mod/likes/views/default/annotation/likes.php
+++ b/mod/likes/views/default/annotation/likes.php
@@ -30,7 +30,7 @@ $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}",
- 'text' => "<span class=\"elgg-icon elgg-icon-delete right\"></span>",
+ 'text' => "<span class=\"elgg-icon elgg-icon-delete float-alt\"></span>",
'confirm' => elgg_echo('deleteconfirm'),
'encode_text' => false,
));