X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fviews_ui%2Fsrc%2FViewEditForm.php;fp=web%2Fcore%2Fmodules%2Fviews_ui%2Fsrc%2FViewEditForm.php;h=75b518fdc863212a44ce8a08a41996ff5b635e0f;hp=67d1229555d2f0733669be862b3659a98301afc3;hb=bfbba508964731508b9bd6d5835c2edc858db95b;hpb=cb9a80db11fc6b014e5b1e693a5a391c95eb5d9a

diff --git a/web/core/modules/views_ui/src/ViewEditForm.php b/web/core/modules/views_ui/src/ViewEditForm.php
index 67d122955..75b518fdc 100644
--- 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);