diff -u b/core/modules/system/templates/feed-icon.html.twig b/core/modules/system/templates/feed-icon.html.twig --- b/core/modules/system/templates/feed-icon.html.twig +++ b/core/modules/system/templates/feed-icon.html.twig @@ -11,9 +11,7 @@ * - * @see template_preprocess_feed_icon() - * * @ingroup themeable */ #} - {{ 'Subscribe to'|t }} {{ title }} + {{ 'Subscribe to !title'|t({'!title': title|striptags}) }} diff -u b/core/themes/classy/templates/system/feed-icon.html.twig b/core/themes/classy/templates/system/feed-icon.html.twig --- b/core/themes/classy/templates/system/feed-icon.html.twig +++ b/core/themes/classy/templates/system/feed-icon.html.twig @@ -11,9 +11,7 @@ * - * @see template_preprocess_feed_icon() - * * @ingroup themeable */ #} - {{ 'Subscribe to'|t }} {{ title }} + {{ 'Subscribe to !title'|t({'!title': title|striptags}) }} only in patch2: unchanged: --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -1104,30 +1104,6 @@ function template_preprocess_item_list(&$variables) { } /** - * Prepares variables for feed icon templates. - * - * Default template: feed-icon.html.twig. - * - * @param array $variables - * An associative array containing: - * - url: An internal system path or a fully qualified external URL of the - * feed. - * - title: A descriptive title of the feed. - */ -function template_preprocess_feed_icon(&$variables) { - $text = t('Subscribe to !feed-title', array('!feed-title' => $variables['title'])); - $variables['icon'] = array( - '#theme' => 'image__feed_icon', - '#uri' => 'core/misc/feed.png', - '#width' => 16, - '#height' => 16, - '#alt' => $text, - ); - // Stripping tags because that's what l() used to do. - $variables['attributes']['title'] = strip_tags($text); -} - -/** * Returns HTML for an indentation div; used for drag and drop tables. * * @param $variables