diff options
| author | zotlabs <mike@macgirvin.com> | 2018-11-07 01:43:26 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-11-07 01:43:26 -0800 |
| commit | 714831195319bcb5359511ce6cd9c5dccc6099dd (patch) | |
| tree | b32dc341c1ee307ea8ad655b3798ed945bbec310 /Zotlabs/Module/Ping.php | |
| parent | f57fcefe6bc70ef06fcf61a204a15b142c030ac5 (diff) | |
| parent | fc1d8c0138f834ffa1c9044525c32757059c0f23 (diff) | |
| download | volse-hubzilla-714831195319bcb5359511ce6cd9c5dccc6099dd.tar.gz volse-hubzilla-714831195319bcb5359511ce6cd9c5dccc6099dd.tar.bz2 volse-hubzilla-714831195319bcb5359511ce6cd9c5dccc6099dd.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
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']) |