friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-24 17:04:58 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #10142 from annando/event-notice

Browse source 
Avoid notices when creating events
This commit is contained in:
Hypolite Petovan 2021-04-11 06:44:13 -04:00 committed by GitHub
parent db414c8212 5b2c4d70be
commit 61a53af48b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mod/events.php
View file

@ -489,7 +489,7 @@ function events_content(App $a)
$fdt = $orig_event['finish'] ?? 'now'; $fdt = $orig_event['finish'] ?? 'now';
$tz = date_default_timezone_get(); $tz = date_default_timezone_get();
if (!empty($orig_event)) { if (isset($orig_event['adjust'])) {
$tz = ($orig_event['adjust'] ? date_default_timezone_get() : 'UTC'); $tz = ($orig_event['adjust'] ? date_default_timezone_get() : 'UTC');
} }

5
src/Model/Event.php
View file

@ -293,11 +293,10 @@ class Event
} }
$private = intval($arr['private'] ?? 0); $private = intval($arr['private'] ?? 0);
$conditions = ['uid' => $event['uid']];
if ($event['cid']) { if ($event['cid']) {
$conditions['id'] = $event['cid']; $conditions = ['id' => $event['cid']];
} else { } else {
$conditions['self'] = true; $conditions = ['uid' => $event['uid'], 'self' => true];
} }
$contact = DBA::selectFirst('contact', [], $conditions); $contact = DBA::selectFirst('contact', [], $conditions);