aboutsummaryrefslogtreecommitdiffstats
path: root/include/poller.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-05-18 13:14:34 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-05-18 13:14:34 -0700
commit51db7536380d70e2047aa91c3a12809cc3444aa8 (patch)
tree359c67869e57a5c42aed637f63c2dd7953bddbb7 /include/poller.php
parente271035879660bc9996101f3a23d61c88ecd5f53 (diff)
parent7c7a5cba8fe6fd6dc15acc14954d9ba9ed632c00 (diff)
downloadvolse-hubzilla-51db7536380d70e2047aa91c3a12809cc3444aa8.tar.gz
volse-hubzilla-51db7536380d70e2047aa91c3a12809cc3444aa8.tar.bz2
volse-hubzilla-51db7536380d70e2047aa91c3a12809cc3444aa8.zip
Merge branch 'tres'
Diffstat (limited to 'include/poller.php')
-rw-r--r--include/poller.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/poller.php b/include/poller.php
index bc48c3f00..a175d59b5 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -59,10 +59,9 @@ function poller_run($argv, $argc){
// expire any expired items
$r = q("select id from item where expires != '%s' and expires < %s
- and ( item_restrict & %d ) = 0 ",
+ and item_deleted = 0 ",
dbesc(NULL_DATE),
- db_utcnow(),
- intval(ITEM_DELETED)
+ db_utcnow()
);
if($r) {
require_once('include/items.php');