diff --git a/core/modules/rest/src/Plugin/views/display/RestExport.php b/core/modules/rest/src/Plugin/views/display/RestExport.php index a3081ca..69b433c 100644 --- a/core/modules/rest/src/Plugin/views/display/RestExport.php +++ b/core/modules/rest/src/Plugin/views/display/RestExport.php @@ -13,10 +13,8 @@ use Drupal\Core\Render\RendererInterface; use Drupal\Core\Routing\RouteProviderInterface; use Drupal\Core\State\StateInterface; -use Drupal\views\Plugin\views\display\DisplayPluginInterface; use Drupal\views\Plugin\views\display\PathPluginBase; use Drupal\views\Plugin\views\display\ResponseDisplayPluginInterface; -use Drupal\views\Plugin\views\style\StylePluginBase; use Drupal\views\Render\ViewsRenderPipelineMarkup; use Drupal\views\ViewExecutable; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -347,17 +345,6 @@ public function render() { /** * {@inheritdoc} - */ - public function postSaveView(DisplayPluginInterface $original_display = NULL) { - parent::postSaveView($original_display); - - /** @var StylePluginBase $style_plugin */ - $style_plugin = $this->getPlugin('style'); - $style_plugin->postSaveView($original_display); - } - - /** - * {@inheritdoc} * * The DisplayPluginBase preview method assumes we will be returning a render * array. The data plugin will already return the serialized string. diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php index eba2db6..5ecce20 100644 --- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php +++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php @@ -22,6 +22,7 @@ use Drupal\views\Plugin\views\area\AreaPluginBase; use Drupal\views\ViewExecutable; use Drupal\views\Plugin\views\PluginBase; +use Drupal\views\Plugin\views\style\StylePluginBase; use Drupal\views\Views; /** @@ -2685,6 +2686,9 @@ protected function isBaseTableTranslatable() { * {@inheritdoc} */ public function postSaveView(DisplayPluginInterface $original_display = NULL) { + /** @var StylePluginBase $style_plugin */ + $style_plugin = $this->getPlugin('style'); + $style_plugin->postSaveView($original_display); } } diff --git a/core/modules/views/src/Tests/Plugin/AccessTest.php b/core/modules/views/src/Tests/Plugin/AccessTest.php index 1e2419a..c56ca18 100644 --- a/core/modules/views/src/Tests/Plugin/AccessTest.php +++ b/core/modules/views/src/Tests/Plugin/AccessTest.php @@ -105,14 +105,6 @@ function testStaticAccessPlugin() { // termination event fires. Simulate that here. $this->container->get('router.builder')->rebuildIfNeeded(); - // Clear the page cache. - // @todo Remove as part of https://www.drupal.org/node/2464657. The root - // cause is that the access plugins alters the route's access - // requirements. That means that the 403 from above does not have any - // cache tags, so modifying the View entity does not cause the cached 403 - // page to be invalidated. - Cache::invalidateTags(['rendered']); - $access_plugin = $view->getDisplay()->getPlugin('access'); $this->assertTrue($access_plugin->access($this->normalUser));