commit 35a703223f3427f9194b0854501edc121398d32a Author: Joel Pittet Date: Mon May 11 13:18:29 2015 -0700 relative path for branding links diff --git a/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php b/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php index 780b598..8369416 100644 --- a/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php +++ b/core/modules/language/src/Tests/LanguageUILanguageNegotiationTest.php @@ -404,17 +404,13 @@ function testUrlLanguageFallback() { // Check that the language switcher active link matches the given browser // language. - $args = [ - ':id' => 'block-test-language-block', - ':url' => \Drupal::url('') . $langcode_browser_fallback, - ':absolute_url' => \Drupal::url('', [], ['absolute' => TRUE]) . $langcode_browser_fallback - ]; + $args = array(':id' => 'block-test-language-block', ':url' => \Drupal::url('') . $langcode_browser_fallback); $fields = $this->xpath('//div[@id=:id]//a[@class="language-link is-active" and starts-with(@href, :url)]', $args); $this->assertTrue($fields[0] == $languages[$langcode_browser_fallback]->getName(), 'The browser language is the URL active language'); // Check that URLs are rewritten using the given browser language. - $fields = $this->xpath('//div[@class="site-name"]/a[@rel="home" and @href=:absolute_url]', $args); - $this->assertTrue(!empty($fields) == 'Drupal', 'URLs are rewritten using the browser language.'); + $fields = $this->xpath('//div[@class="site-name"]/a[@rel="home" and @href=:url]', $args); + $this->assertTrue($fields[0] == 'Drupal', 'URLs are rewritten using the browser language.'); } /** diff --git a/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php b/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php index c163c3f..cd38de6 100644 --- a/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php +++ b/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php @@ -77,7 +77,6 @@ function testPageCacheTags() { 'route.menu_active_trails:tools', 'theme', 'timezone', - 'url.site', 'user.permissions', 'user.roles', ]; diff --git a/core/modules/system/templates/block--system-branding-block.html.twig b/core/modules/system/templates/block--system-branding-block.html.twig index 4c64251..6920a65 100644 --- a/core/modules/system/templates/block--system-branding-block.html.twig +++ b/core/modules/system/templates/block--system-branding-block.html.twig @@ -17,13 +17,13 @@ #} {% block content %} {% if site_logo %} - + {{ 'Home'|t }} {% endif %} {% if site_name %}
- {{ site_name }} + {{ site_name }}
{% endif %} {% if site_slogan %} diff --git a/core/themes/bartik/templates/block--system-branding-block.html.twig b/core/themes/bartik/templates/block--system-branding-block.html.twig index 6b5859f..44ff621 100644 --- a/core/themes/bartik/templates/block--system-branding-block.html.twig +++ b/core/themes/bartik/templates/block--system-branding-block.html.twig @@ -16,7 +16,7 @@ {% set attributes = attributes.addClass('branding') %} {% block content %} {% if site_logo %} - {% endif %} @@ -24,7 +24,7 @@
{% if site_name %} - {{ site_name }} + {{ site_name }} {% endif %} {% if site_slogan %} diff --git a/core/themes/classy/templates/block/block--system-branding-block.html.twig b/core/themes/classy/templates/block/block--system-branding-block.html.twig index c26ce7a..7c3b7de 100644 --- a/core/themes/classy/templates/block/block--system-branding-block.html.twig +++ b/core/themes/classy/templates/block/block--system-branding-block.html.twig @@ -15,13 +15,13 @@ #} {% block content %} {% if site_logo %} - {% endif %} {% if site_name %} {% endif %} {% if site_slogan %} diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme index 73453a3..15ac31e 100644 --- a/core/themes/seven/seven.theme +++ b/core/themes/seven/seven.theme @@ -149,7 +149,7 @@ function seven_preprocess_install_page(&$variables) { $site_config = \Drupal::config('system.site'); // Seven has custom styling for the install page. $variables['#attached']['library'][] = 'seven/install-page'; - $variables['site_name'] = SafeMarkup::checkPlain($site_config->get('name')); + $variables['site_name'] = $site_config->get('name'); } /** @@ -159,7 +159,7 @@ function seven_preprocess_maintenance_page(&$variables) { $site_config = \Drupal::config('system.site'); // Seven has custom styling for the maintenance page. $variables['#attached']['library'][] = 'seven/maintenance-page'; - $variables['site_name'] = SafeMarkup::checkPlain($site_config->get('name')); + $variables['site_name'] = $site_config->get('name'); } /**