diff options
| author | zotlabs <mike@macgirvin.com> | 2018-02-14 15:37:35 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-02-14 15:37:35 -0800 |
| commit | c11ebd12d5baa6aa8f7ea51b7e753ed2d3a0d1d8 (patch) | |
| tree | b052b2d5e52b751aa7242e7938fca56879d2da7e /Zotlabs/Lib/Enotify.php | |
| parent | 465d89129caaaa0240229f8d6f81d68f26eb60b0 (diff) | |
| parent | 033608292007a726b6fdffe839f6e481939f7a1d (diff) | |
| download | volse-hubzilla-c11ebd12d5baa6aa8f7ea51b7e753ed2d3a0d1d8.tar.gz volse-hubzilla-c11ebd12d5baa6aa8f7ea51b7e753ed2d3a0d1d8.tar.bz2 volse-hubzilla-c11ebd12d5baa6aa8f7ea51b7e753ed2d3a0d1d8.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs/Lib/Enotify.php')
| -rw-r--r-- | Zotlabs/Lib/Enotify.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php index 5820c8b0c..c5bc706c2 100644 --- a/Zotlabs/Lib/Enotify.php +++ b/Zotlabs/Lib/Enotify.php @@ -130,7 +130,7 @@ class Enotify { } if ($params['type'] == NOTIFY_COMMENT) { -// logger("notification: params = " . print_r($params, true), LOGGER_DEBUG); + //logger("notification: params = " . print_r($params, true), LOGGER_DEBUG); $moderated = (($params['item']['item_blocked'] == ITEM_MODERATED) ? true : false); @@ -138,7 +138,7 @@ class Enotify { $action = 'commented on'; - if(array_key_exists('item',$params) && (! visible_activity($params['item']))) { + if(array_key_exists('item',$params) && in_array($params['item']['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) { if(! $always_show_in_notices) { logger('notification: not a visible activity. Ignoring.'); @@ -146,10 +146,10 @@ class Enotify { return; } - if(activity_match($params['item']['verb'], ACTIVITY_LIKE)) + if(activity_match($params['verb'], ACTIVITY_LIKE)) $action = 'liked'; - if(activity_match($params['item']['verb'], ACTIVITY_DISLIKE)) + if(activity_match($params['verb'], ACTIVITY_DISLIKE)) $action = 'disliked'; } @@ -212,7 +212,7 @@ class Enotify { // "your post" if($p[0]['owner']['xchan_name'] == $p[0]['author']['xchan_name'] && intval($p[0]['item_wall'])) - $dest_str = sprintf(t('%1$s, %2$s %3$s [zrl=%3$s]your %5$s[/zrl]'), + $dest_str = sprintf(t('%1$s, %2$s %3$s [zrl=%4$s]your %5$s[/zrl]'), $recip['channel_name'], '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', $action, |