diff options
| author | zotlabs <mike@macgirvin.com> | 2017-07-28 15:25:29 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-07-28 15:25:29 -0700 |
| commit | e316494e06062f05c8026111dc1132fb6868bce5 (patch) | |
| tree | 82c221a92d6075bd38c16174bcb8187fb017181e /Zotlabs/Module/Network.php | |
| parent | d3a5911932201eda2328123873d75e8c13cb9a89 (diff) | |
| parent | 4585e35b3e086638fa7a0c3832d80c57339a397e (diff) | |
| download | volse-hubzilla-e316494e06062f05c8026111dc1132fb6868bce5.tar.gz volse-hubzilla-e316494e06062f05c8026111dc1132fb6868bce5.tar.bz2 volse-hubzilla-e316494e06062f05c8026111dc1132fb6868bce5.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs/Module/Network.php')
| -rw-r--r-- | Zotlabs/Module/Network.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index 45623c7b0..25e7adb49 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -534,12 +534,13 @@ class Network extends \Zotlabs\Web\Controller { if($parents_str) { $update_unseen = " AND ( id IN ( " . dbesc($parents_str) . " )"; + $update_unseen .= " AND item_notshown = 0"; $update_unseen .= " OR ( parent IN ( " . dbesc($parents_str) . " ) AND verb in ( '" . dbesc(ACTIVITY_LIKE) . "','" . dbesc(ACTIVITY_DISLIKE) . "' ))) "; } } else { if($parents_str) { - $update_unseen = " AND parent IN ( " . dbesc($parents_str) . " )"; + $update_unseen = " AND parent IN ( " . dbesc($parents_str) . " ) AND item_notshown = 0"; } } } |