commit 428ee5a981f45a823e084656c3f6589e5f2fd952 Author: Joel Pittet Date: Thu Jun 20 22:52:04 2013 -0600 cleanup diff --git a/core/includes/theme.inc b/core/includes/theme.inc index ae2f5e9..9ed374f 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -1815,16 +1815,13 @@ function theme_dropbutton_wrapper($variables) { * - attributes: Associative array of attributes to be placed in the img tag. */ function template_preprocess_image(&$variables) { - $attributes = $variables['attributes']; - $attributes['src'] = file_create_url($variables['uri']); + $variables['attributes']['src'] = file_create_url($variables['uri']); foreach (array('width', 'height', 'alt', 'title') as $key) { if (isset($variables[$key])) { - $attributes[$key] = $variables[$key]; + $variables['attributes'][$key] = $variables[$key]; } } - - $variables['attributes'] = new Attribute($attributes); } /** diff --git a/core/modules/system/templates/image.html.twig b/core/modules/system/templates/image.html.twig index 7bbbfe1..b6b238a 100644 --- a/core/modules/system/templates/image.html.twig +++ b/core/modules/system/templates/image.html.twig @@ -6,12 +6,9 @@ * Available variables: * - attributes: HTML attributes for the img tag. * - * @see template_preprocess() * @see template_preprocess_image() * * @ingroup themeable */ #} -{% spaceless %} - -{% endspaceless %} +