diff core/modules/views/src/Entity/View.php @ 14:1fec387a4317

Update Drupal core to 8.5.2 via Composer

--- a/core/modules/views/src/Entity/View.php	Mon Apr 23 09:33:26 2018 +0100
+++ b/core/modules/views/src/Entity/View.php	Mon Apr 23 09:46:53 2018 +0100
@@ -245,6 +245,7 @@
     $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 @@
     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 @@
   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());
     }