From 63b8020969434756a7b966ae615c28bf7680f2f8 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 24 Mar 2015 17:09:42 -0700 Subject: more work on expiration, make system limits useful - even in retrospect --- include/items.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'include/items.php') diff --git a/include/items.php b/include/items.php index a1515ad88..da0e50c4c 100755 --- a/include/items.php +++ b/include/items.php @@ -3922,6 +3922,10 @@ function item_expire($uid,$days) { $expire_network_only = 1; + $expire_limit = get_config('system','expire_limit'); + if(! intval($expire_limit)) + $expire_limit = 5000; + $sql_extra = ((intval($expire_network_only)) ? " AND not (item_flags & " . intval(ITEM_WALL) . ") > 0 " : ""); $r = q("SELECT * FROM `item` @@ -3930,7 +3934,7 @@ function item_expire($uid,$days) { AND `id` = `parent` $sql_extra AND NOT ( item_flags & %d )>0 - AND (item_restrict = 0 ) ", + AND (item_restrict = 0 ) LIMIT $expire_limit ", intval($uid), db_utcnow(), db_quoteinterval(intval($days).' DAY'), intval(ITEM_RETAINED) -- cgit v1.2.3