diff options
| author | Mario <mario@mariovavti.com> | 2018-11-05 09:42:07 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-11-05 09:42:07 +0100 |
| commit | 92ea3ef72036c39601b69565f3e03fa44ad9aef7 (patch) | |
| tree | 24a2bd3b6cb0285655eaf78ff4fb5d59635df9e3 /Zotlabs/Module/Ping.php | |
| parent | de0fab78edd469ee0b6572e157e901ccf0078c6a (diff) | |
| parent | de32b0bba55d8570214546df5d3f50397308001f (diff) | |
| download | volse-hubzilla-92ea3ef72036c39601b69565f3e03fa44ad9aef7.tar.gz volse-hubzilla-92ea3ef72036c39601b69565f3e03fa44ad9aef7.tar.bz2 volse-hubzilla-92ea3ef72036c39601b69565f3e03fa44ad9aef7.zip | |
Merge branch 'dev' into 'dev'
more fixes for forum notifications handling: do not count likes/dislikes if…
See merge request hubzilla/core!1367
Diffstat (limited to 'Zotlabs/Module/Ping.php')
| -rw-r--r-- | Zotlabs/Module/Ping.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index cf5b2e004..f660c3b55 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -650,7 +650,7 @@ class Ping extends \Zotlabs\Web\Controller { $p_sql = (($p_str) ? "OR parent IN ( $p_str )" : ''); $r = q("select count(id) as unseen from item - where uid = %d and ( owner_xchan = '%s' OR author_xchan = '%s' $p_sql ) and item_unseen = 1 $item_normal", + where uid = %d and ( owner_xchan = '%s' OR author_xchan = '%s' $p_sql ) and item_unseen = 1 $item_normal $sql_extra", intval(local_channel()), dbesc($forums[$x]['xchan_hash']), dbesc($forums[$x]['xchan_hash']) |