MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3602 from annando/1707-expiration

Browse source 
Bugfix: the expiration check in item_store now works again
This commit is contained in:
Tobias Diekershoff 2017-07-23 22:21:30 +02:00 committed by GitHub
parent 95301fd58c b266d7d6ff
commit f3f42ae3a2
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/items.php
View file

@ -575,11 +575,11 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
$expire_interval = $r['expire']; $expire_interval = $r['expire'];
} }
if ($expire_interval > 0) { if (($expire_interval > 0) && !empty($arr['created'])) {
$expire_date = datetime_convert('UTC', 'UTC', '- '.$expire_interval.' days'); $expire_date = time() - ($expire_interval * 86400);
$created_date = datetime_convert('UTC', 'UTC', $arr['created']); $created_date = strtotime($arr['created']);
if ($created_date < $expire_date) { if ($created_date < $expire_date) {
logger('item-store: item created ('.$arr['created'].') before expiration time ('.$expire_date->format(DateTime::W3C).'). ignored. ' . print_r($arr,true), LOGGER_DEBUG); logger('item-store: item created ('.date('c', $created_date).') before expiration time ('.date('c', $expire_date).'). ignored. ' . print_r($arr,true), LOGGER_DEBUG);
return 0; return 0;
} }
} }