diff --git a/core/modules/field/lib/Drupal/field/FieldInstance.php b/core/modules/field/lib/Drupal/field/FieldInstance.php index 75040c0..7a99be2 100644 --- a/core/modules/field/lib/Drupal/field/FieldInstance.php +++ b/core/modules/field/lib/Drupal/field/FieldInstance.php @@ -39,14 +39,11 @@ public function __construct(array $definition) { /** * Returns the Widget plugin for the instance. * - * @param bool $skip_cache - * (optional) Whether to skiup the static cache. Defaults to FALSE. - * * @return \Drupal\field\Plugin\Type\Widget\WidgetInterface * The Widget plugin to be used for the instance. */ - public function getWidget($skip_cache = FALSE) { - if (empty($this->widget) || $skip_cache) { + public function getWidget() { + if (empty($this->widget)) { $widget_properties = $this->definition['widget']; // Let modules alter the widget properties. diff --git a/core/modules/field_ui/field_ui.admin.inc b/core/modules/field_ui/field_ui.admin.inc index 7c779fb..df38d93 100644 --- a/core/modules/field_ui/field_ui.admin.inc +++ b/core/modules/field_ui/field_ui.admin.inc @@ -944,14 +944,17 @@ function field_ui_default_value_widget($field, $instance, &$form, &$form_state) $field_type = field_info_field_types($field['type']); $default_widget = field_info_widget_types($field_type['default_widget']); - $instance['widget']['type'] = $default_widget['id']; - $instance['widget']['settings'] = $default_widget['settings']; + $instance['widget'] = array( + 'type' => $default_widget['id'], + 'settings' => $default_widget['settings'], + 'weight' => 0, + ); } // Insert the widget. Since we do not use the "official" instance definition, // the whole flow cannot use field_invoke_method(). $items = (array) $instance['default_value']; - $element += $instance->getWidget(TRUE)->form($entity, LANGUAGE_NOT_SPECIFIED, $items, $element, $form_state); + $element += $instance->getWidget()->form($entity, LANGUAGE_NOT_SPECIFIED, $items, $element, $form_state); return $element; }