diff options
| author | zotlabs <mike@macgirvin.com> | 2017-10-08 12:43:50 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-10-08 12:43:50 -0700 |
| commit | 27bc8294aecb847e0e87e61ff0c11cf64d4a9c10 (patch) | |
| tree | d2676995161eec0b85daed4df8997943e840493a /Zotlabs/Lib | |
| parent | 6f709a6f57d10df73bf6d6ba5fc44c22d80f8717 (diff) | |
| parent | 991db280be4c3cbbff4fb1e4dae8f303a487ed3f (diff) | |
| download | volse-hubzilla-27bc8294aecb847e0e87e61ff0c11cf64d4a9c10.tar.gz volse-hubzilla-27bc8294aecb847e0e87e61ff0c11cf64d4a9c10.tar.bz2 volse-hubzilla-27bc8294aecb847e0e87e61ff0c11cf64d4a9c10.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs/Lib')
| -rw-r--r-- | Zotlabs/Lib/Enotify.php | 6 | ||||
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php index 9f3347d19..e82c11a35 100644 --- a/Zotlabs/Lib/Enotify.php +++ b/Zotlabs/Lib/Enotify.php @@ -130,7 +130,9 @@ class Enotify { if ($params['type'] == NOTIFY_COMMENT) { // logger("notification: params = " . print_r($params, true), LOGGER_DEBUG); - $itemlink = $params['link']; + $moderated = (($params['item']['item_blocked'] == ITEM_MODERATED) ? true : false); + + $itemlink = $params['link']; // ignore like/unlike activity on posts - they probably require a separate notification preference @@ -170,8 +172,6 @@ class Enotify { xchan_query($p); - $moderated = (($p[0]['item_blocked'] == ITEM_MODERATED) ? true : false); - $item_post_type = item_post_type($p[0]); // $private = $p[0]['item_private']; $parent_id = $p[0]['id']; diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index d916ce2c1..67a507025 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -758,7 +758,7 @@ class ThreadItem { '$cipher' => $conv->get_cipher(), '$sourceapp' => \App::$sourcename, '$observer' => get_observer_hash(), - '$anoncomments' => (($conv->get_mode() === 'channel' && perm_is_allowed($conv->get_profile_owner(),'','post_comments')) ? true : false), + '$anoncomments' => ((($conv->get_mode() === 'channel' || $conv->get_mode() === 'display') && perm_is_allowed($conv->get_profile_owner(),'','post_comments')) ? true : false), '$anonname' => [ 'anonname', t('Your full name (required)') ], '$anonmail' => [ 'anonmail', t('Your email address (required)') ], '$anonurl' => [ 'anonurl', t('Your website URL (optional)') ] |