tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #3806 from annando/expire

Browse source 
Bugfix: Item were stored before the expiration date
This commit is contained in:
Tobias Diekershoff 2017-10-18 20:23:01 +02:00 committed by GitHub
parent 59ce6de50c 1cff94d476
commit 48e471855e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/items.php
View file

@ -572,7 +572,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
$expire_interval = Config::get('system', 'dbclean-expire-days', 0);
$r = dba::select('user', array('expire'), array('uid' => $uid), array("limit" => 1));
if (dbm::is_result($r) && ($r['expire'] > 0) && ($r['expire'] < $expire_interval)) {
if (dbm::is_result($r) && ($r['expire'] > 0) && (($r['expire'] < $expire_interval) || ($expire_interval == 0))) {
$expire_interval = $r['expire'];
}