merge from upsream 3.8.5 release

This commit is contained in:
harukin
2018-11-19 21:40:07 +09:00
parent f560fe3b37
commit 577102c4ec
8 changed files with 39 additions and 23 deletions

View File

@@ -608,8 +608,6 @@ function get_item_elements($x,$allow_code = false) {
$arr['created'] = datetime_convert('UTC','UTC',$x['created']);
$arr['edited'] = datetime_convert('UTC','UTC',$x['edited']);
if($arr['created'] > datetime_convert())
$arr['created'] = datetime_convert();
if($arr['edited'] > datetime_convert())
$arr['edited'] = datetime_convert();