aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorgit-marijus <mario@mariovavti.com>2017-07-28 23:07:16 +0200
committergit-marijus <mario@mariovavti.com>2017-07-28 23:07:16 +0200
commit4585e35b3e086638fa7a0c3832d80c57339a397e (patch)
tree82c221a92d6075bd38c16174bcb8187fb017181e /Zotlabs
parent9717d4502f460e56d76eb52c244124e2b995677c (diff)
downloadvolse-hubzilla-4585e35b3e086638fa7a0c3832d80c57339a397e.tar.gz
volse-hubzilla-4585e35b3e086638fa7a0c3832d80c57339a397e.tar.bz2
volse-hubzilla-4585e35b3e086638fa7a0c3832d80c57339a397e.zip
filter by item_notshown instead of obj_type
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Network.php4
-rw-r--r--Zotlabs/Module/Ping.php5
2 files changed, 4 insertions, 5 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index a1b70fea0..25e7adb49 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -534,13 +534,13 @@ 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 .= " 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) . " ) AND obj_type != " . dbesc(ACTIVITY_OBJ_FILE) . "";
+ $update_unseen = " AND parent IN ( " . dbesc($parents_str) . " ) AND item_notshown = 0";
}
}
}
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php
index ddb3a8c12..26b3d3de9 100644
--- a/Zotlabs/Module/Ping.php
+++ b/Zotlabs/Module/Ping.php
@@ -401,10 +401,9 @@ class Ping extends \Zotlabs\Web\Controller {
WHERE item_unseen = 1 and uid = %d
$item_normal
AND author_xchan != '%s'
- AND obj_type != '%s'",
+ AND item_notshown = 0",
intval(local_channel()),
- dbesc($ob_hash),
- dbesc(ACTIVITY_OBJ_FILE)
+ dbesc($ob_hash)
);
if($r) {