mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24263 from nextcloud/backport/24108/stable20 

[stable20] Use correct year for generated birthdays events
This commit is contained in:
Morris Jobke 2020-11-20 22:41:51 +01:00 committed by GitHub
parent cb2bed6a8a 5aac8a1b34
commit e772fd6409
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/dav/lib/CalDAV/BirthdayService.php
View File

@ -235,7 +235,12 @@ class BirthdayService {
} }
} else { } else {
$originalYear = (int)$dateParts['year']; $originalYear = (int)$dateParts['year'];
// 'X-APPLE-OMIT-YEAR' is not always present, at least iOS 12.4 uses the hard coded date of 1604 (the start of the gregorian calendar) when the year is unknown
if ($originalYear == 1604) {
$originalYear = null;
$unknownYear = true;
$birthday = '1970-' . $dateParts['month'] . '-' . $dateParts['date'];
}
if ($originalYear < 1970) { if ($originalYear < 1970) {
$birthday = '1970-' . $dateParts['month'] . '-' . $dateParts['date']; $birthday = '1970-' . $dateParts['month'] . '-' . $dateParts['date'];
} }