diff --git a/core/modules/datetime_range/src/Plugin/Field/FieldFormatter/DateRangeCustomFormatter.php b/core/modules/datetime_range/src/Plugin/Field/FieldFormatter/DateRangeCustomFormatter.php index a23de51..fa52d9e 100644 --- a/core/modules/datetime_range/src/Plugin/Field/FieldFormatter/DateRangeCustomFormatter.php +++ b/core/modules/datetime_range/src/Plugin/Field/FieldFormatter/DateRangeCustomFormatter.php @@ -48,7 +48,9 @@ public function viewElements(FieldItemListInterface $items, $langcode) { /** @var \Drupal\Core\Datetime\DrupalDateTime $end_date */ $end_date = $item->end_date; - if ($start_date->format('U') !== $end_date->format('U')) { + $format = $this->getFieldSetting('datetime_type') === 'date' ? DATETIME_DATE_STORAGE_FORMAT : DATETIME_DATETIME_STORAGE_FORMAT; + $options = ['timezone' => DATETIME_STORAGE_TIMEZONE]; + if ($start_date->format($format, $options) !== $end_date->format($format, $options)) { $elements[$delta] = [ 'start_date' => $this->buildDate($start_date), 'separator' => ['#plain_text' => ' ' . $separator . ' '], diff --git a/core/modules/datetime_range/src/Plugin/Field/FieldFormatter/DateRangeDefaultFormatter.php b/core/modules/datetime_range/src/Plugin/Field/FieldFormatter/DateRangeDefaultFormatter.php index c0feed2..5545878 100644 --- a/core/modules/datetime_range/src/Plugin/Field/FieldFormatter/DateRangeDefaultFormatter.php +++ b/core/modules/datetime_range/src/Plugin/Field/FieldFormatter/DateRangeDefaultFormatter.php @@ -49,7 +49,9 @@ public function viewElements(FieldItemListInterface $items, $langcode) { /** @var \Drupal\Core\Datetime\DrupalDateTime $end_date */ $end_date = $item->end_date; - if ($start_date->format('U') !== $end_date->format('U')) { + $format = $this->getFieldSetting('datetime_type') === 'date' ? DATETIME_DATE_STORAGE_FORMAT : DATETIME_DATETIME_STORAGE_FORMAT; + $options = ['timezone' => DATETIME_STORAGE_TIMEZONE]; + if ($start_date->format($format, $options) !== $end_date->format($format, $options)) { $elements[$delta] = [ 'start_date' => $this->buildDateWithIsoAttribute($start_date), 'separator' => ['#plain_text' => ' ' . $separator . ' '], diff --git a/core/modules/datetime_range/src/Plugin/Field/FieldFormatter/DateRangePlainFormatter.php b/core/modules/datetime_range/src/Plugin/Field/FieldFormatter/DateRangePlainFormatter.php index 4842e1f..6ae68fe 100644 --- a/core/modules/datetime_range/src/Plugin/Field/FieldFormatter/DateRangePlainFormatter.php +++ b/core/modules/datetime_range/src/Plugin/Field/FieldFormatter/DateRangePlainFormatter.php @@ -48,7 +48,9 @@ public function viewElements(FieldItemListInterface $items, $langcode) { /** @var \Drupal\Core\Datetime\DrupalDateTime $end_date */ $end_date = $item->end_date; - if ($start_date->format('U') !== $end_date->format('U')) { + $format = $this->getFieldSetting('datetime_type') === 'date' ? DATETIME_DATE_STORAGE_FORMAT : DATETIME_DATETIME_STORAGE_FORMAT; + $options = ['timezone' => DATETIME_STORAGE_TIMEZONE]; + if ($start_date->format($format, $options) !== $end_date->format($format, $options)) { $elements[$delta] = [ 'start_date' => $this->buildDate($start_date), 'separator' => ['#plain_text' => ' ' . $separator . ' '],