Merge pull request #10142 from annando/event-notice
Avoid notices when creating events
This commit is contained in:
commit
61a53af48b
|
@ -489,7 +489,7 @@ function events_content(App $a)
|
|||
$fdt = $orig_event['finish'] ?? 'now';
|
||||
|
||||
$tz = date_default_timezone_get();
|
||||
if (!empty($orig_event)) {
|
||||
if (isset($orig_event['adjust'])) {
|
||||
$tz = ($orig_event['adjust'] ? date_default_timezone_get() : 'UTC');
|
||||
}
|
||||
|
||||
|
|
|
@ -293,11 +293,10 @@ class Event
|
|||
}
|
||||
$private = intval($arr['private'] ?? 0);
|
||||
|
||||
$conditions = ['uid' => $event['uid']];
|
||||
if ($event['cid']) {
|
||||
$conditions['id'] = $event['cid'];
|
||||
$conditions = ['id' => $event['cid']];
|
||||
} else {
|
||||
$conditions['self'] = true;
|
||||
$conditions = ['uid' => $event['uid'], 'self' => true];
|
||||
}
|
||||
|
||||
$contact = DBA::selectFirst('contact', [], $conditions);
|
||||
|
|
Loading…
Reference in a new issue