diff --git a/core/modules/picture/lib/Drupal/picture/Plugin/field/formatter/PictureFormatter.php b/core/modules/picture/lib/Drupal/picture/Plugin/field/formatter/PictureFormatter.php index 1e536b3..debebb4 100644 --- a/core/modules/picture/lib/Drupal/picture/Plugin/field/formatter/PictureFormatter.php +++ b/core/modules/picture/lib/Drupal/picture/Plugin/field/formatter/PictureFormatter.php @@ -172,7 +172,7 @@ public function viewElements(FieldItemListInterface $items) { '#width' => $item['width'], '#height' => $item['height'], '#breakpoints' => $breakpoint_styles, - '#alt' => isset($item['alt']) ? $item['alt'] : NULL, + '#alt' => isset($item['alt']) || array_key_exists('alt', $item) ? $item['alt'] : NULL, '#title' => isset($item['title']) ? $item['title'] : NULL, '#attributes' => isset($item['attributes']) ? $item['attributes'] : NULL, '#attached' => array('library' => array( diff --git a/core/modules/picture/picture.module b/core/modules/picture/picture.module index 7278449..d36f256 100644 --- a/core/modules/picture/picture.module +++ b/core/modules/picture/picture.module @@ -173,11 +173,12 @@ function template_preprocess_picture(&$variables) { // Prepare picture tag attributes. $attributes = array(); - foreach (array('alt', 'title') as $key) { - if (isset($variables[$key])) { - $attributes[$key] = $variables[$key]; - } - } + if (isset($variables['alt']) || array_key_exists('alt', $variables) { + $attributes['alt'] = $variables['alt']; + } + if (isset($variables['title'])) { + $attributes['title'] = $variables['title']; + } $variables['attributes'] = new Attribute($attributes); if (!empty($variables['breakpoints'])) { @@ -240,7 +241,7 @@ function template_preprocess_picture(&$variables) { '#width' => $variables['width'], '#height' => $variables['height'], '#style_name' => $variables['style_name'], - '#alt' => isset($variables['alt']) ? $variables['alt'] : NULL, + '#alt' => isset($variables['alt']) || array_key_exists('alt', $variables) ? $variables['alt'] : NULL, '#title' => isset($variables['title']) ? $variables['title'] : NULL, ); } @@ -251,7 +252,7 @@ function template_preprocess_picture(&$variables) { '#uri' => $variables['uri'], '#width' => $variables['width'], '#height' => $variables['height'], - '#alt' => isset($variables['alt']) ? $variables['alt'] : NULL, + '#alt' => isset($variables['alt']) || array_key_exists('alt', $variables) ? $variables['alt'] : NULL, '#title' => isset($variables['title']) ? $variables['title'] : NULL, ); }