diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php index 295452ef32427659629a08afcce3c0b77d393f07..7774a58c4e82c88a11e495354d0d44aa615e247f 100644 --- a/core/modules/views_ui/src/ViewEditForm.php +++ b/core/modules/views_ui/src/ViewEditForm.php @@ -16,6 +16,7 @@ use Drupal\Core\Url; use Drupal\views\Views; use Symfony\Component\DependencyInjection\ContainerInterface; +use Symfony\Component\HttpFoundation\Exception\BadRequestException; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException; use Drupal\Core\Extension\ModuleHandlerInterface; @@ -464,7 +465,7 @@ public function getDisplayDetails($view, $display) { if ($path && (!str_contains($path, '%'))) { // Wrap this in a try/catch as trying to generate links to some - // routes may throw a NotAcceptableHttpException if they do not + // routes may throw an exception, for example if they do not // respond to HTML, such as RESTExports. try { if (!parse_url($path, PHP_URL_SCHEME)) { @@ -476,7 +477,7 @@ public function getDisplayDetails($view, $display) { $url = Url::fromUri("base:$path"); } } - catch (NotAcceptableHttpException $e) { + catch (BadRequestException | NotAcceptableHttpException $e) { $url = '/' . $path; } diff --git a/core/modules/views_ui/src/ViewListBuilder.php b/core/modules/views_ui/src/ViewListBuilder.php index b494fbc78c3d0a256556ac8df6cd3fe15bca154c..9bb1bf9cd48d3a2139ebfda0aeb44b5f55200308 100644 --- a/core/modules/views_ui/src/ViewListBuilder.php +++ b/core/modules/views_ui/src/ViewListBuilder.php @@ -10,6 +10,7 @@ use Drupal\Core\Link; use Drupal\Core\Url; use Symfony\Component\DependencyInjection\ContainerInterface; +use Symfony\Component\HttpFoundation\Exception\BadRequestException; use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException; /** @@ -261,14 +262,14 @@ protected function getDisplaysList(EntityInterface $view) { $path = $display->getPath(); if ($view->status() && !str_contains($path, '%')) { // Wrap this in a try/catch as trying to generate links to some - // routes may throw a NotAcceptableHttpException if they do not + // routes may throw an exception, for example if they do not // respond to HTML, such as RESTExports. try { // @todo Views should expect and store a leading /. See: // https://www.drupal.org/node/2423913 $rendered_path = Link::fromTextAndUrl('/' . $path, Url::fromUserInput('/' . $path))->toString(); } - catch (NotAcceptableHttpException $e) { + catch (BadRequestException | NotAcceptableHttpException $e) { $rendered_path = '/' . $path; } } diff --git a/core/modules/views_ui/tests/modules/views_ui_test/config/install/views.view.sa_contrib_2013_035.yml b/core/modules/views_ui/tests/modules/views_ui_test/config/install/views.view.sa_contrib_2013_035.yml index 80029fb944ac8c7705aa48fc9123f85df361a7db..d6280799790c9b196fa5ceaf522d3c8cbcadeaaf 100644 --- a/core/modules/views_ui/tests/modules/views_ui_test/config/install/views.view.sa_contrib_2013_035.yml +++ b/core/modules/views_ui/tests/modules/views_ui_test/config/install/views.view.sa_contrib_2013_035.yml @@ -183,4 +183,4 @@ display: display_plugin: page position: 2 display_options: - path: foobar + path: 'foobar ' diff --git a/core/modules/views_ui/tests/src/Functional/XssTest.php b/core/modules/views_ui/tests/src/Functional/XssTest.php index 2c3ca64b5f708e38b8d09cb13fafc1fdf1b23204..887bdfae72c77c252584fe60a169f4a25bd028a9 100644 --- a/core/modules/views_ui/tests/src/Functional/XssTest.php +++ b/core/modules/views_ui/tests/src/Functional/XssTest.php @@ -37,6 +37,8 @@ public function testViewsUi(): void { */ public function testNoDoubleEscaping(): void { $this->drupalGet('admin/structure/views'); + $this->assertSession()->pageTextContains('sa_contrib_2013_035'); + $this->assertSession()->pageTextContains('Page (/foobar )'); $this->assertSession()->assertNoEscaped('<'); $this->drupalGet('admin/structure/views/view/sa_contrib_2013_035');