clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7867 from annando/fix-notive 

Notice/warning in event fixed
This commit is contained in:
Tobias Diekershoff 2019-11-25 13:09:46 +01:00 committed by GitHub
parent 4f52a90d05 06a6774a7b
commit 15d5ac890b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Model/Event.php
View File

@ -257,7 +257,7 @@ class Event extends BaseObject
$event['deny_cid'] = $arr['deny_cid'] ?? ''; $event['deny_cid'] = $arr['deny_cid'] ?? '';
$event['deny_gid'] = $arr['deny_gid'] ?? ''; $event['deny_gid'] = $arr['deny_gid'] ?? '';
$event['adjust'] = intval($arr['adjust'] ?? 0); $event['adjust'] = intval($arr['adjust'] ?? 0);
$event['nofinish'] = intval(!empty($arr['nofinish'] || !empty($event['start']) && empty($event['finish']))); $event['nofinish'] = intval($arr['nofinish'] ?? (!empty($event['start']) && empty($event['finish'])));
$event['created'] = DateTimeFormat::utc(($arr['created'] ?? '') ?: 'now'); $event['created'] = DateTimeFormat::utc(($arr['created'] ?? '') ?: 'now');
$event['edited'] = DateTimeFormat::utc(($arr['edited'] ?? '') ?: 'now'); $event['edited'] = DateTimeFormat::utc(($arr['edited'] ?? '') ?: 'now');