Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / core / modules / datetime / src / Plugin / Field / FieldFormatter / DateTimeFormatterBase.php

diff --git a/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeFormatterBase.php b/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeFormatterBase.php
index 98b1ea3857f9767351dae171a77e5c69eec18875..a6680f6b4d3eeebef76ec46d507e2f37c8cfe437 100644 (file)
--- a/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeFormatterBase.php
+++ b/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeFormatterBase.php
@@ -11,6 +11,7 @@ use Drupal\Core\Field\FormatterBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem;
+use Drupal\datetime\Plugin\Field\FieldType\DateTimeItemInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -167,7 +168,7 @@ abstract class DateTimeFormatterBase extends FormatterBase implements ContainerF
   protected function setTimeZone(DrupalDateTime $date) {
     if ($this->getFieldSetting('datetime_type') === DateTimeItem::DATETIME_TYPE_DATE) {
       // A date without time has no timezone conversion.
-      $timezone = DATETIME_STORAGE_TIMEZONE;
+      $timezone = DateTimeItemInterface::STORAGE_TIMEZONE;
     }
     else {
       $timezone = drupal_get_user_timezone();
@@ -201,10 +202,6 @@ abstract class DateTimeFormatterBase extends FormatterBase implements ContainerF
    *   A render array.
    */
   protected function buildDate(DrupalDateTime $date) {
-    if ($this->getFieldSetting('datetime_type') == DateTimeItem::DATETIME_TYPE_DATE) {
-      // A date without time will pick up the current time, use the default.
-      datetime_date_default_time($date);
-    }
     $this->setTimeZone($date);
 
     $build = [
@@ -229,11 +226,6 @@ abstract class DateTimeFormatterBase extends FormatterBase implements ContainerF
    *   A render array.
    */
   protected function buildDateWithIsoAttribute(DrupalDateTime $date) {
-    if ($this->getFieldSetting('datetime_type') == DateTimeItem::DATETIME_TYPE_DATE) {
-      // A date without time will pick up the current time, use the default.
-      datetime_date_default_time($date);
-    }
-
     // Create the ISO date in Universal Time.
     $iso_date = $date->format("Y-m-d\TH:i:s") . 'Z';