diff --git a/core/modules/views/tests/src/Kernel/Handler/AreaDisplayLinkTest.php b/core/modules/views/tests/src/Kernel/Handler/AreaDisplayLinkTest.php index e409a2be0f..b169e94ce0 100644 --- a/core/modules/views/tests/src/Kernel/Handler/AreaDisplayLinkTest.php +++ b/core/modules/views/tests/src/Kernel/Handler/AreaDisplayLinkTest.php @@ -327,8 +327,8 @@ protected function assertRenderedDisplayLinks(ViewExecutable $view, $display_id) $view->destroy(); $view->setDisplay($display_id); $this->executeView($view); - $this->assertSame('Page 1', $this->renderDisplayLink($view, 'display_link_1')); - $this->assertSame('Page 2', $this->renderDisplayLink($view, 'display_link_2')); + $this->assertEquals('Page 1', $this->renderDisplayLink($view, 'display_link_1')); + $this->assertEquals('Page 2', $this->renderDisplayLink($view, 'display_link_2')); // Assert the exposed filters, pager and contextual links are passed // correctly in the links. @@ -341,8 +341,8 @@ protected function assertRenderedDisplayLinks(ViewExecutable $view, $display_id) ]); $view->setCurrentPage(2); $this->executeView($view, [1]); - $this->assertSame('Page 1', $this->renderDisplayLink($view, 'display_link_1')); - $this->assertSame('Page 2', $this->renderDisplayLink($view, 'display_link_2')); + $this->assertEquals('Page 1', $this->renderDisplayLink($view, 'display_link_1')); + $this->assertEquals('Page 2', $this->renderDisplayLink($view, 'display_link_2')); } /** diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc index f65eec2e46..183f367ed8 100644 --- a/core/modules/views/views.theme.inc +++ b/core/modules/views/views.theme.inc @@ -1032,6 +1032,9 @@ function template_preprocess_views_mini_pager(&$variables) { $element = $variables['element']; $parameters = $variables['parameters']; $pager = $pager_manager->getPager($element); + if (!$pager) { + return; + } $current = $pager->getCurrentPage(); $total = $pager->getTotalPages();