diff --git a/core/modules/views_ui/src/Tests/DisplayPathTest.php b/core/modules/views_ui/src/Tests/DisplayPathTest.php index 1515b2f8aa45bcbe7ba200f4f61574423df7d7c0..275dce78903e3dffc0c46f51c772395a36c2ffbc 100644 --- a/core/modules/views_ui/src/Tests/DisplayPathTest.php +++ b/core/modules/views_ui/src/Tests/DisplayPathTest.php @@ -57,7 +57,10 @@ protected function doBasicPathUITest() { $this->drupalPostForm('admin/structure/views/nojs/display/test_view/page_1/path', array('path' => $random_path), t('Apply')); $this->assertText('/' . $random_path, 'The custom path appears in the summary.'); - $this->assertLink(t('View @display', array('@display' => 'Page')), 0, 'view page link found on the page.'); + $display_link_text = t('View @display', ['@display' => 'Page']); + $this->assertLink($display_link_text, 0, 'view page link found on the page.'); + $this->clickLink($display_link_text); + $this->assertUrl($random_path); } /** diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php index e13ae62f03de137eaba22052bfa4c55b71bd25b4..1b335de24af679c9550be8cbfa134822a98bce04 100644 --- a/core/modules/views_ui/src/ViewEditForm.php +++ b/core/modules/views_ui/src/ViewEditForm.php @@ -414,14 +414,13 @@ public function getDisplayDetails($view, $display) { elseif ($view->status() && $view->getExecutable()->displayHandlers->get($display['id'])->hasPath()) { $path = $view->getExecutable()->displayHandlers->get($display['id'])->getPath(); if ($path && (strpos($path, '%') === FALSE)) { - $uri = "base:$path"; if (!parse_url($path, PHP_URL_SCHEME)) { // @todo Views should expect and store a leading /. See: // https://www.drupal.org/node/2423913 - $url = Url::fromUserInput('/' . ltrim($uri, '/')); + $url = Url::fromUserInput('/' . ltrim($path, '/')); } else { - $url = Url::fromUri($uri); + $url = Url::fromUri("base:$path"); } $build['top']['actions']['path'] = array( '#type' => 'link',