diff core/modules/views/src/ViewExecutable.php @ 5:12f9dff5fda9 tip

Update to Drupal core 8.7.1

--- a/core/modules/views/src/ViewExecutable.php	Thu Feb 28 13:11:55 2019 +0000
+++ b/core/modules/views/src/ViewExecutable.php	Thu May 09 15:34:47 2019 +0100
@@ -925,7 +925,7 @@
     if (!isset($this->pager)) {
       $this->pager = $this->display_handler->getPlugin('pager');
 
-      if ($this->pager->usePager()) {
+      if ($this->usePager()) {
         $this->pager->setCurrentPage($this->current_page);
       }
 
@@ -951,7 +951,7 @@
    *   The render array of the pager if it's set, blank string otherwise.
    */
   public function renderPager($exposed_input) {
-    if (!empty($this->pager) && $this->pager->usePager()) {
+    if ($this->usePager()) {
       return $this->pager->render($exposed_input);
     }
 
@@ -1417,7 +1417,7 @@
     }
 
     if ($cache->cacheGet('results')) {
-      if ($this->pager->usePager()) {
+      if ($this->usePager()) {
         $this->pager->total_items = $this->total_rows;
         $this->pager->updatePageInfo();
       }
@@ -1470,7 +1470,7 @@
     // @TODO In the longrun, it would be great to execute a view without
     //   the theme system at all. See https://www.drupal.org/node/2322623.
     $active_theme = \Drupal::theme()->getActiveTheme();
-    $themes = array_keys($active_theme->getBaseThemes());
+    $themes = array_keys($active_theme->getBaseThemeExtensions());
     $themes[] = $active_theme->getName();
 
     // Check for already-cached output.