diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 493ceab..88a37e7 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -1693,8 +1693,8 @@ function template_preprocess_html(&$variables) { // Construct page title. if (!empty($variables['page']['#title'])) { $head_title = array( - 'title' => SafeMarkup::set(trim(strip_tags($variables['page']['#title']))), - 'name' => String::checkPlain($site_config->get('name')), + 'title' => trim(strip_tags($variables['page']['#title'])), + 'name' => $site_config->get('name'), ); } // @todo Remove once views is not bypassing the view subscriber anymore. @@ -1702,11 +1702,11 @@ function template_preprocess_html(&$variables) { elseif (drupal_is_front_page()) { $head_title = array( 'title' => t('Home'), - 'name' => String::checkPlain($site_config->get('name')), + 'name' => $site_config->get('name'), ); } else { - $head_title = array('name' => String::checkPlain($site_config->get('name'))); + $head_title = array('name' => $site_config->get('name')); if ($site_config->get('slogan')) { $head_title['slogan'] = strip_tags(Xss::filterAdmin($site_config->get('slogan'))); } @@ -1716,10 +1716,10 @@ function template_preprocess_html(&$variables) { $output = ''; $separator = ''; foreach ($head_title as $item) { - $output .= $separator . SafeMarkup::escape($item); + $output .= $separator . $item; $separator = ' | '; } - $variables['head_title'] = SafeMarkup::set($output); + $variables['head_title'] = $output; // Collect all attachments. This must happen in the preprocess function for // #type => html, to ensure that attachments added in #pre_render callbacks