core/modules/datetime/datetime.module | 42 -------------------- .../Plugin/field/widget/DatetimeDatelistWidget.php | 19 --------- .../Plugin/field/widget/DatetimeDefaultWidget.php | 19 --------- .../Drupal/datetime/Tests/DatetimeFieldTest.php | 2 - 4 files changed, 82 deletions(-) diff --git a/core/modules/datetime/datetime.module b/core/modules/datetime/datetime.module index b545c36..e6f8985 100644 --- a/core/modules/datetime/datetime.module +++ b/core/modules/datetime/datetime.module @@ -249,48 +249,6 @@ function datetime_field_load($entity_type, $entities, $field, $instances, $langc } /** - * Sets a default value for an empty date field. - * - * Callback for $instance['default_value_function'], as implemented by - * Drupal\datetime\Plugin\field\widget\DateTimeDatepicker. - * - * @param $entity_type - * - * @param $entity - * - * @param array $field - * - * @param array $instance - * - * @param $langcode - * - * - * @return array - * - */ -function datetime_default_value($entity, $field, $instance, $langcode) { - - $value = ''; - $date = ''; - if ($instance['settings']['default_value'] == 'now') { - // A default value should be in the format and timezone used for date - // storage. - $date = new DrupalDateTime('now', DATETIME_STORAGE_TIMEZONE); - $storage_format = $field['settings']['datetime_type'] == 'date' ? DATETIME_DATE_STORAGE_FORMAT: DATETIME_DATETIME_STORAGE_FORMAT; - $value = $date->format($storage_format); - } - - // We only provide a default value for the first item, as do all fields. - // Otherwise, there is no way to clear out unwanted values on multiple value - // fields. - $item = array(); - $item[0]['value'] = $value; - $item[0]['date'] = $date; - - return $item; -} - -/** * Sets a consistent time on a date without time. * * The default time for a date without time can be anything, so long as it is diff --git a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDatelistWidget.php b/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDatelistWidget.php index f0d60fe..78ed2dd 100644 --- a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDatelistWidget.php +++ b/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDatelistWidget.php @@ -36,25 +36,6 @@ class DateTimeDatelistWidget extends WidgetBase { /** - * {@inheritdoc} - */ - public function __construct($plugin_id, array $plugin_definition, FieldInstance $instance, array $settings) { - // Identify the function used to set the default value. - $instance['default_value_function'] = $this->defaultValueFunction(); - parent::__construct($plugin_id, $plugin_definition, $instance, $settings); - } - - /** - * Returns the callback used to set a date default value. - * - * @return string - * The name of the callback to use when setting a default date value. - */ - public function defaultValueFunction() { - return 'datetime_default_value'; - } - - /** * Implements \Drupal\field\Plugin\Type\Widget\WidgetInterface::formElement(). */ public function formElement(array $items, $delta, array $element, $langcode, array &$form, array &$form_state) { diff --git a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDefaultWidget.php b/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDefaultWidget.php index f0c45c0..ffffb66 100644 --- a/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDefaultWidget.php +++ b/core/modules/datetime/lib/Drupal/datetime/Plugin/field/widget/DatetimeDefaultWidget.php @@ -30,25 +30,6 @@ class DateTimeDefaultWidget extends WidgetBase { /** - * {@inheritdoc} - */ - public function __construct($plugin_id, array $plugin_definition, FieldInstance $instance, array $settings) { - // Identify the function used to set the default value. - $instance['default_value_function'] = $this->defaultValueFunction(); - parent::__construct($plugin_id, $plugin_definition, $instance, $settings); - } - - /** - * Return the callback used to set a date default value. - * - * @return string - * The name of the callback to use when setting a default date value. - */ - public function defaultValueFunction() { - return 'datetime_default_value'; - } - - /** * Implements \Drupal\field\Plugin\Type\Widget\WidgetInterface::formElement(). * */ diff --git a/core/modules/datetime/lib/Drupal/datetime/Tests/DatetimeFieldTest.php b/core/modules/datetime/lib/Drupal/datetime/Tests/DatetimeFieldTest.php index dd7712e..a801296 100644 --- a/core/modules/datetime/lib/Drupal/datetime/Tests/DatetimeFieldTest.php +++ b/core/modules/datetime/lib/Drupal/datetime/Tests/DatetimeFieldTest.php @@ -287,7 +287,6 @@ function testDefaultValue() { // Set the default value to 'now'. $this->instance['settings']['default_value'] = 'now'; - $this->instance['default_value_function'] = 'datetime_default_value'; field_update_instance($this->instance); // Display creation form. @@ -305,7 +304,6 @@ function testDefaultValue() { // Set the default value to 'blank'. $this->instance['settings']['default_value'] = 'blank'; - $this->instance['default_value_function'] = 'datetime_default_value'; field_update_instance($this->instance); // Display creation form.