aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-11-07 22:45:13 -0800
committerfriendica <info@friendica.com>2013-11-07 22:45:13 -0800
commit90ab0d963bf5074643c6f275dbb8595b6c51a03d (patch)
tree2ac38a103bff6d469e7d8cd250dedb2a15b63d56
parent4b3db9b5234eb2c85d9d29305abb73e81f7558b6 (diff)
downloadvolse-hubzilla-90ab0d963bf5074643c6f275dbb8595b6c51a03d.tar.gz
volse-hubzilla-90ab0d963bf5074643c6f275dbb8595b6c51a03d.tar.bz2
volse-hubzilla-90ab0d963bf5074643c6f275dbb8595b6c51a03d.zip
we should probably only expire things once...
-rw-r--r--include/poller.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/poller.php b/include/poller.php
index e5a274758..3c4e6402c 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -47,7 +47,10 @@ function poller_run($argv, $argc){
q("delete from mail where expires != '0000-00-00 00:00:00' and expires < UTC_TIMESTAMP() ");
- $r = q("select id from item where expires != '0000-00-00 00:00:00' and expires < UTC_TIMESTAMP() ");
+ $r = q("select id from item where expires != '0000-00-00 00:00:00' and expires < UTC_TIMESTAMP()
+ and not ( item_restrict & %d ) ",
+ intval(ITEM_DELETED)
+ );
if($r) {
require_once('include/items.php');
foreach($r as $rr)