Merge pull request #1661 from michaelkuhn/import-fix-datetime

fix(Import): Fix DateTime subtype checks

Author: blizzz

lib/Service/ImportService.php

@@ -168,12 +168,16 @@ private function getPreviewData(Worksheet $worksheet): array {
 					|| (is_array($columns[$colIndex])
 						&& $columns[$colIndex]['type'] === Column::TYPE_DATETIME)
 				) {
-					if (isset($columns[$colIndex]['subtype'])
-						&& $columns[$colIndex]['subtype'] === Column::SUBTYPE_DATETIME_DATE
+					if (
+						($column && $column->getSubtype() === Column::SUBTYPE_DATETIME_DATE)
+						|| (is_array($columns[$colIndex])
+							&& $columns[$colIndex]['subtype'] === Column::SUBTYPE_DATETIME_DATE)
 					) {
 						$format = 'Y-m-d';
-					} elseif (isset($columns[$colIndex]['subtype'])
-						&& $columns[$colIndex]['subtype'] === Column::SUBTYPE_DATETIME_TIME
+					} elseif (
+						($column && $column->getSubtype() === Column::SUBTYPE_DATETIME_TIME)
+						|| (is_array($columns[$colIndex])
+							&& $columns[$colIndex]['subtype'] === Column::SUBTYPE_DATETIME_TIME)
 					) {
 						$format = 'H:i';
 					} else {