diff --git a/core/modules/image/image.post_update.php b/core/modules/image/image.post_update.php index 7684b94daf..fe41c9f55c 100644 --- a/core/modules/image/image.post_update.php +++ b/core/modules/image/image.post_update.php @@ -23,22 +23,22 @@ function image_post_update_image_style_dependencies() { } /** - * Add filter image style to basic_html and full_html filters. + * Add filter image style to basic_html and full_html filter formats. */ -function image_enable_filter_image_style() { - $filters = ['basic_html' => 11, 'full_html' => 12]; - foreach ($filters as $filter => $weight) { - if ($filter = FilterFormat::load($filter)) { - $filter->setFilterConfig('filter_image_style', ['status' => TRUE, 'weight' => $weight]); - if (($filter = $filter->filters('filter_html')) && $filter->status) { - $config = $filter->getConfiguration(); +function image_post_update_enable_filter_image_style() { + $formats = ['basic_html' => 11, 'full_html' => 12]; + foreach ($formats as $format => $weight) { + if ($format = FilterFormat::load($format)) { + $format->setFilterConfig('filter_image_style', ['status' => TRUE, 'weight' => $weight]); + if (($format = $format->filters('filter_html')) && $format->status) { + $config = $format->getConfiguration(); $allowed_html = !empty($config['settings']['allowed_html']) ? $config['settings']['allowed_html'] : NULL; $matches = []; if ($allowed_html && preg_match('/]*)>/', $allowed_html, $matches)) { $new_attributes = array_filter(explode(' ', $matches[1])); $new_attributes[] = 'data-image-style'; $config['settings']['allowed_html'] = preg_replace('/]*)>/', '', $allowed_html); - $filter->setFilterConfig('filter_html', $config); + $format->setFilterConfig('filter_html', $config); } } }