Upgraded drupal core with security updates

[yaffs-website] / web / core / modules / views_ui / src / ViewEditForm.php

diff --git a/web/core/modules/views_ui/src/ViewEditForm.php b/web/core/modules/views_ui/src/ViewEditForm.php
index 67d1229555d2f0733669be862b3659a98301afc3..75b518fdc863212a44ce8a08a41996ff5b635e0f 100644 (file)
--- a/web/core/modules/views_ui/src/ViewEditForm.php
+++ b/web/core/modules/views_ui/src/ViewEditForm.php
@@ -275,7 +275,7 @@ class ViewEditForm extends ViewFormBase {
 
     // Rename display ids if needed.
     foreach ($executable->displayHandlers as $id => $display) {
-      if (!empty($display->display['new_id']) && empty($display->display['deleted'])) {
+      if (!empty($display->display['new_id']) && $display->display['new_id'] !== $display->display['id'] && empty($display->display['deleted'])) {
         $new_id = $display->display['new_id'];
         $display->display['id'] = $new_id;
         unset($display->display['new_id']);
@@ -290,6 +290,9 @@ class ViewEditForm extends ViewFormBase {
           'display_id' => $new_id,
         ]);
       }
+      elseif (isset($display->display['new_id'])) {
+        unset($display->display['new_id']);
+      }
     }
     $view->set('display', $displays);