aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Network.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-11-03 19:18:55 -0700
committerzotlabs <mike@macgirvin.com>2017-11-03 19:18:55 -0700
commitf51a7225c877870f01829c2284fec1ab27ffbee2 (patch)
tree026b4eb97df9dfa0516c46c72e9b70d19e32529c /Zotlabs/Module/Network.php
parent9abb061e7185a29cb85ebbad04deba715e1a6a06 (diff)
parenta899ce1c22386b9ff882048cba35d46f560ee654 (diff)
downloadvolse-hubzilla-f51a7225c877870f01829c2284fec1ab27ffbee2.tar.gz
volse-hubzilla-f51a7225c877870f01829c2284fec1ab27ffbee2.tar.bz2
volse-hubzilla-f51a7225c877870f01829c2284fec1ab27ffbee2.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.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index 66032aada..4deb7c9e8 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -533,13 +533,12 @@ class Network extends \Zotlabs\Web\Controller {
if($parents_str) {
$update_unseen = " AND ( id IN ( " . dbesc($parents_str) . " )";
- $update_unseen .= " AND obj_type != '" . dbesc(ACTIVITY_OBJ_FILE) . "'";
$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) . " ) AND obj_type != '" . dbesc(ACTIVITY_OBJ_FILE) . "'";
+ $update_unseen = " AND parent IN ( " . dbesc($parents_str) . " )";
}
}
}