Skip to content

[stable24] fix(caldav): Fix reminder timezone drift for all-day events - #36662

Merged
MichaIng merged 1 commit into
stable24from
backport/36192/stable24
Feb 27, 2023
Merged

[stable24] fix(caldav): Fix reminder timezone drift for all-day events#36662
MichaIng merged 1 commit into
stable24from
backport/36192/stable24

Conversation

@backportbot-nextcloud

@backportbot-nextcloudbackportbot-nextcloudBot commented Feb 10, 2023

Copy link
Copy Markdown
  • ⚠️ This backport had conflicts and is incomplete

backport of #36192

@blizzz

Copy link
Copy Markdown
Member

moving to 24.0.11. also, conflicts.

@blizzzblizzz added the 2. developing Work in progress label Feb 13, 2023
@MichaIng

Copy link
Copy Markdown
Member

/rebase

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
@MichaIng
MichaIngforce-pushed the backport/36192/stable24 branch from 51f828d to ba6e13dCompareFebruary 27, 2023 15:16
@MichaIngMichaIng added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Feb 27, 2023
@MichaIng

MichaIng commented Feb 27, 2023

Copy link
Copy Markdown
Member

Conflict solved.

 'id' => $reminder['object_id'],
], $reminder['event_hash'], $alarmHash, true, false);
- ], $reminder['event_hash'], $alarmHash, true, false);+ ], $calendarTimeZone, $reminder['event_hash'], $alarmHash, true, false);
$this->writeRemindersToDatabase($alarms);

Was not done automatically due to changed indentation.

@MichaIng
MichaIng merged commit 6b01e5d into stable24Feb 27, 2023
@MichaIng
MichaIng deleted the backport/36192/stable24 branch February 27, 2023 22:01
@blizzzblizzz mentioned this pull request Mar 13, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsbugfeature: caldavRelated to CalDAV internalsfeature: dav

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@blizzz@MichaIng@ChristophWurst