switch back to filter by ACTIVITY_OBJ_FILE for marking items read in /network since item_notshown is also used for likes

This commit is contained in:
git-marijus 2017-07-29 11:37:35 +02:00
parent eedee6d0a1
commit c4e0e20eb3

View File

@ -534,13 +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 .= " 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 item_notshown = 0";
$update_unseen = " AND parent IN ( " . dbesc($parents_str) . " ) AND obj_type != " . dbesc(ACTIVITY_OBJ_FILE) . "";
}
}
}