Merge pull request #24108 from csware/apple-unknown-year

skjnldsv · web-flow · commit ce5e60d4b5f6 · 2020-11-17T09:20:59.000+01:00
Use correct year for generated birthdays events
diff --git a/apps/dav/lib/CalDAV/BirthdayService.php b/apps/dav/lib/CalDAV/BirthdayService.php
@@ -235,7 +235,12 @@ public function buildDateFromContact(string $cardData,
 				}
 			} else {
 				$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) {
 					$birthday = '1970-' . $dateParts['month'] . '-' . $dateParts['date'];
 				}

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,12 @@ public function buildDateFromContact(string $cardData,`
`235`	`235`	`}`
`236`	`236`	`} else {`
`237`	`237`	`$originalYear = (int)$dateParts['year'];`
`238`		`-`
	`238`	`+ // '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`
	`239`	`+ if ($originalYear == 1604) {`
	`240`	`+ $originalYear = null;`
	`241`	`+ $unknownYear = true;`
	`242`	`+ $birthday = '1970-' . $dateParts['month'] . '-' . $dateParts['date'];`
	`243`	`+ }`
`239`	`244`	`if ($originalYear < 1970) {`
`240`	`245`	`$birthday = '1970-' . $dateParts['month'] . '-' . $dateParts['date'];`
`241`	`246`	`}`