Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / core / modules / views / src / Entity / View.php

diff --git a/web/core/modules/views/src/Entity/View.php b/web/core/modules/views/src/Entity/View.php
index b69234c3bcb9a0dab34d3d9ef55836c51e2a2368..44007eb7fc60b4cc12470c93ceba11fcd4f0fed8 100644 (file)
--- a/web/core/modules/views/src/Entity/View.php
+++ b/web/core/modules/views/src/Entity/View.php
@@ -245,6 +245,7 @@ class View extends ConfigEntityBase implements ViewEntityInterface {
     $display_duplicate = $displays[$old_display_id];
     unset($display_duplicate['display_title']);
     unset($display_duplicate['display_plugin']);
+    unset($display_duplicate['new_id']);
 
     $displays[$new_display_id] = NestedArray::mergeDeep($displays[$new_display_id], $display_duplicate);
     $displays[$new_display_id]['id'] = $new_display_id;
@@ -387,7 +388,7 @@ class View extends ConfigEntityBase implements ViewEntityInterface {
     views_invalidate_cache();
     $this->invalidateCaches();
 
-    // Rebuild the router if this is a new view, or it's status changed.
+    // Rebuild the router if this is a new view, or its status changed.
     if (!isset($this->original) || ($this->status() != $this->original->status())) {
       \Drupal::service('router.builder')->setRebuildNeeded();
     }
@@ -456,7 +457,7 @@ class View extends ConfigEntityBase implements ViewEntityInterface {
   public static function postDelete(EntityStorageInterface $storage, array $entities) {
     parent::postDelete($storage, $entities);
 
-    $tempstore = \Drupal::service('user.shared_tempstore')->get('views');
+    $tempstore = \Drupal::service('tempstore.shared')->get('views');
     foreach ($entities as $entity) {
       $tempstore->delete($entity->id());
     }