diff --git a/core/modules/image/image.field.inc b/core/modules/image/image.field.inc index f05ae4c..245d149 100644 --- a/core/modules/image/image.field.inc +++ b/core/modules/image/image.field.inc @@ -6,6 +6,7 @@ */ use Drupal\Component\Utility\NestedArray; +use Drupal\Core\Render\Element; /** * Prepares variables for image widget templates. @@ -18,19 +19,20 @@ */ function template_preprocess_image_widget(&$variables) { $element = $variables['element']; - $element['#attributes']['class'] = array('image-widget', 'form-managed-file', 'clearfix'); - if (isset($element['preview'])) { - $variables['preview'] = $element['preview']; - } + $variables['attributes'] = $element['#attributes']; + $variables['attributes']['class'] = array('image-widget', 'form-managed-file', 'clearfix'); if (!empty($element['fids']['#value'])) { $file = reset($element['#files']); $element['file_' . $file->id()]['filename']['#suffix'] = ' (' . format_size($file->getSize()) . ') '; } - $variables['data'] = $element; - $variables['attributes'] = $element['#attributes']; + $variables['data'] = array(); + foreach (Element::children($element) as $child) { + $variables['data'][$child] = $element[$child]; + } + } /** diff --git a/core/modules/image/templates/image-widget.html.twig b/core/modules/image/templates/image-widget.html.twig index 4bd1ec3..8bdc5f1 100644 --- a/core/modules/image/templates/image-widget.html.twig +++ b/core/modules/image/templates/image-widget.html.twig @@ -5,8 +5,7 @@ * * Available variables: * - attributes: HTML attributes for the containing element. - * - preview: A rendered preview image. - * - data: Render elements of image data. + * - data: Render elements of the image widget. * * @see template_preprocess_image_widget() * @@ -14,16 +13,13 @@ */ #} - {% if preview is defined %} + {% if data.preview %}
- {{ preview }} + {{ data.preview }}
{% endif %}
- {# - Render widget data without the image preview, prefix and suffix that - were output already. - #} - {{ data|without('preview', '#prefix', '#suffix') }} + {# Render widget data without the image preview that was output already. #} + {{ data|without('preview') }}