aboutsummaryrefslogtreecommitdiffstats
path: root/include/items.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-24 20:38:53 -0700
committerfriendica <info@friendica.com>2015-03-24 20:38:53 -0700
commit022305fe8383be238a442efdbd5ba3463d15b7ab (patch)
treeff9d3832f5a305eadd435d385f847d9900994dfa /include/items.php
parent63b8020969434756a7b966ae615c28bf7680f2f8 (diff)
downloadvolse-hubzilla-022305fe8383be238a442efdbd5ba3463d15b7ab.tar.gz
volse-hubzilla-022305fe8383be238a442efdbd5ba3463d15b7ab.tar.bz2
volse-hubzilla-022305fe8383be238a442efdbd5ba3463d15b7ab.zip
also allow service classes to set post expiration. These take priority over the site default.
Diffstat (limited to 'include/items.php')
-rwxr-xr-xinclude/items.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/items.php b/include/items.php
index da0e50c4c..a8947202d 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3926,15 +3926,15 @@ function item_expire($uid,$days) {
if(! intval($expire_limit))
$expire_limit = 5000;
- $sql_extra = ((intval($expire_network_only)) ? " AND not (item_flags & " . intval(ITEM_WALL) . ") > 0 " : "");
+ $sql_extra = ((intval($expire_network_only)) ? " AND (item_flags & " . intval(ITEM_WALL) . ") = 0 " : "");
$r = q("SELECT * FROM `item`
WHERE `uid` = %d
AND `created` < %s - INTERVAL %s
AND `id` = `parent`
$sql_extra
- AND NOT ( item_flags & %d )>0
- AND (item_restrict = 0 ) LIMIT $expire_limit ",
+ AND ( item_flags & %d ) = 0
+ AND ( item_restrict = 0 ) LIMIT $expire_limit ",
intval($uid),
db_utcnow(), db_quoteinterval(intval($days).' DAY'),
intval(ITEM_RETAINED)