aboutsummaryrefslogtreecommitdiffstats
path: root/include/notifier.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-22 21:04:54 -0800
committerfriendica <info@friendica.com>2015-01-22 21:04:54 -0800
commit4c2a1e572a03e253f05f03e400af26d403cbda32 (patch)
treeedf7afa0bb97dfb9c8ea598a28c3e6281a65ec90 /include/notifier.php
parent6e0e3b2433fc426b758a55811f56536d58705813 (diff)
downloadvolse-hubzilla-4c2a1e572a03e253f05f03e400af26d403cbda32.tar.gz
volse-hubzilla-4c2a1e572a03e253f05f03e400af26d403cbda32.tar.bz2
volse-hubzilla-4c2a1e572a03e253f05f03e400af26d403cbda32.zip
start on item_restrict conversion
Diffstat (limited to 'include/notifier.php')
-rw-r--r--include/notifier.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/notifier.php b/include/notifier.php
index 092b27498..6a6879ebb 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -207,9 +207,8 @@ function notifier_run($argv, $argc){
$normal_mode = false;
$expire = true;
$items = q("SELECT * FROM item WHERE uid = %d AND item_wall = 1
- AND ( item_restrict & %d )>0 AND `changed` > %s - INTERVAL %s",
+ AND item_deleted = 1 AND `changed` > %s - INTERVAL %s",
intval($item_id),
- intval(ITEM_DELETED),
db_utcnow(), db_quoteinterval('10 MINUTE')
);
$uid = $item_id;
@@ -314,7 +313,7 @@ function notifier_run($argv, $argc){
$target_item = $r[0];
- if($target_item['item_restrict'] & ITEM_DELETED)
+ if(intval($target_item['item_deleted']))
logger('notifier: target item ITEM_DELETED', LOGGER_DEBUG);
$unforwardable = ITEM_UNPUBLISHED|ITEM_DELAYED_PUBLISH|ITEM_WEBPAGE|ITEM_BUILDBLOCK|ITEM_PDL;
@@ -407,7 +406,7 @@ function notifier_run($argv, $argc){
// don't send deletions onward for other people's stuff
// TODO verify this is needed - copied logic from same place in old code
- if(($target_item['item_restrict'] & ITEM_DELETED) && (! intval($target_item['item_wall']))) {
+ if(intval($target_item['item_deleted']) && (! intval($target_item['item_wall']))) {
logger('notifier: ignoring delete notification for non-wall item');
return;
}