From 3254513103ca87e6313c03ab2193b8ff23535429 Mon Sep 17 00:00:00 2001 From: catch Date: Mon, 26 Sep 2022 12:18:39 +0100 Subject: [PATCH] Issue #3311466 by Temoor, andypost: Remove obsolete ViewExecutable::editing property access --- .../views/src/Plugin/views/display/DisplayPluginBase.php | 2 +- .../views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php index 8e102d9c3ad..ec4121672d6 100644 --- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php +++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php @@ -192,7 +192,7 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte $skip_cache = \Drupal::config('views.settings')->get('skip_cache'); - if (empty($view->editing) || !$skip_cache) { + if (!$skip_cache) { $cid = 'views:unpack_options:' . hash('sha256', serialize([$this->options, $options])) . ':' . \Drupal::languageManager()->getCurrentLanguage()->getId(); if (empty(static::$unpackOptions[$cid])) { $cache = \Drupal::cache('data')->get($cid); diff --git a/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php b/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php index 17369481a2e..7cd7f47e9cb 100644 --- a/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php +++ b/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php @@ -554,9 +554,6 @@ class PathPluginBaseTest extends UnitTestCase { $view->storage = $view_entity; - // Skip views options caching. - $view->editing = TRUE; - $access_plugin = $this->getMockBuilder('Drupal\views\Plugin\views\access\AccessPluginBase') ->disableOriginalConstructor() ->getMockForAbstractClass();