Bugfix: Item were stored before the expiration date

diff --git a/include/items.php b/include/items.php
index a67971cf57b90d833f263b0ece1ae24df3040f19..d1c91b940345d2738ce7b41adb043e8d46c124c4 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -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'];
        }