commit dc2be2deef013fd918cb52a327dbe49ce803bb76 Author: Francesco Placella Date: Wed Jul 8 21:32:14 2015 +0100 Clean up diff --git a/core/modules/filter/src/FilterPermissions.php b/core/modules/filter/src/FilterPermissions.php index 58e1c92..f9ec33b 100644 --- a/core/modules/filter/src/FilterPermissions.php +++ b/core/modules/filter/src/FilterPermissions.php @@ -60,7 +60,7 @@ public function permissions() { foreach ($formats as $format) { if ($permission = $format->getPermissionName()) { $permissions[$permission] = [ - 'title' => $this->t('Use the @label text format', ['@url' => UncacheableUrl::fromUrl($format->urlInfo()), '@label' => $format->label()]), + 'title' => $this->t('Use the @label text format', ['@url' => UncacheableUrl::fromUrl($format->urlInfo())->toString(), '@label' => $format->label()]), 'description' => SafeMarkup::placeholder($this->t('Warning: This permission may have security implications depending on how the text format is configured.')), ]; } diff --git a/core/modules/system/tests/modules/cache_test/src/Controller/CacheTestController.php b/core/modules/system/tests/modules/cache_test/src/Controller/CacheTestController.php index 80fa2fd..c4fc95a 100644 --- a/core/modules/system/tests/modules/cache_test/src/Controller/CacheTestController.php +++ b/core/modules/system/tests/modules/cache_test/src/Controller/CacheTestController.php @@ -48,7 +48,7 @@ public function urlBubblingNoCacheRoute() { $url = Url::fromRoute('')->setAbsolute(); $response = new HtmlResponse(); $build = [ - '#markup' => SafeMarkup::format('This URL is early-rendered: !url. However, it is uncacheable so is supposed to have no cacheable metadata attached. Btw, actually this is not the case as the URL is absolute.', ['!url' => $url->toString()]) + '#markup' => SafeMarkup::format('This URL is early-rendered: !url. However, it is uncacheable so is supposed to have no cacheable metadata attached.', ['!url' => $url->toString()]) ]; $response->setContent($build); return $response;