diff options
| author | zotlabs <mike@macgirvin.com> | 2018-11-07 01:43:43 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-11-07 01:43:43 -0800 |
| commit | d2aa2c080f166e23c4aaaefd09ed7c948a1c3cce (patch) | |
| tree | 12b6e8cef5d347f249479968d08d8f82a9c6e5ff /Zotlabs/Module/Network.php | |
| parent | a5483a03c90967eea58f5a0db17c59c4ec3ff2ff (diff) | |
| parent | 714831195319bcb5359511ce6cd9c5dccc6099dd (diff) | |
| download | volse-hubzilla-d2aa2c080f166e23c4aaaefd09ed7c948a1c3cce.tar.gz volse-hubzilla-d2aa2c080f166e23c4aaaefd09ed7c948a1c3cce.tar.bz2 volse-hubzilla-d2aa2c080f166e23c4aaaefd09ed7c948a1c3cce.zip | |
Merge branch 'master' into zvi
Diffstat (limited to 'Zotlabs/Module/Network.php')
| -rw-r--r-- | Zotlabs/Module/Network.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 294e11c52..b93faa612 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -258,6 +258,10 @@ class Network extends \Zotlabs\Web\Controller { } elseif($pf && $unseen && $nouveau) { + $vnotify = get_pconfig(local_channel(), 'system', 'vnotify'); + if(! ($vnotify & VNOTIFY_LIKE)) + $likes_sql = " AND verb NOT IN ('" . dbesc(ACTIVITY_LIKE) . "', '" . dbesc(ACTIVITY_DISLIKE) . "') "; + // This is for nouveau view public forum cid queries (if a forum notification is clicked) $p = q("SELECT oid AS parent FROM term WHERE uid = %d AND ttype = %d AND term = '%s'", intval(local_channel()), @@ -269,7 +273,7 @@ class Network extends \Zotlabs\Web\Controller { if($p_str) $p_sql = " OR item.parent IN ( $p_str ) "; - $sql_extra = " AND ( owner_xchan = '" . protect_sprintf(dbesc($cid_r[0]['abook_xchan'])) . "' OR owner_xchan = '" . protect_sprintf(dbesc($cid_r[0]['abook_xchan'])) . "' $p_sql ) AND item_unseen = 1 "; + $sql_extra = " AND ( owner_xchan = '" . protect_sprintf(dbesc($cid_r[0]['abook_xchan'])) . "' OR owner_xchan = '" . protect_sprintf(dbesc($cid_r[0]['abook_xchan'])) . "' $p_sql ) AND item_unseen = 1 $likes_sql "; } else { // This is for threaded view cid queries (e.g. if a forum is selected from the forum filter) |