From 1121d5d2f6cfb3f5f3a135c2a3919d16f22d88ec Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Wed, 8 Jul 2015 14:41:55 +0530
Subject: [PATCH] Cancelled page settings changes do not restore the settings
 UI

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 js/page_settings.js                      | 5 +++++
 libraries/config/page_settings.class.php | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/js/page_settings.js b/js/page_settings.js
index 08ab8f5a8a..5c02ba6515 100644
--- a/js/page_settings.js
+++ b/js/page_settings.js
@@ -18,6 +18,8 @@ function showSettings(selector) {
         $(this).dialog('close');
     };
 
+    // Keeping a clone to restore in case the user cancels the operation
+    var $clone = $(selector + ' .page_settings').clone(true);;
     $(selector)
     .dialog({
         title: PMA_messages.strPageSettings,
@@ -27,6 +29,9 @@ function showSettings(selector) {
         open: function() {
             $(this).dialog('option', 'maxHeight', $(window).height() - $(this).offset().top);
         },
+        close: function() {
+            $(selector + ' .page_settings').replaceWith($clone);
+        },
         buttons: buttons
     });
 }
diff --git a/libraries/config/page_settings.class.php b/libraries/config/page_settings.class.php
index 14384d77ee..7686132d85 100644
--- a/libraries/config/page_settings.class.php
+++ b/libraries/config/page_settings.class.php
@@ -161,6 +161,7 @@ class PMA_PageSettings
         $this->_storeError($form_display, $error);
 
         $retval .= '<div id="' . $this->_elemId . '">';
+        $retval .= '<div class="page_settings">';
         $retval .= $form_display->getDisplay(
             true,
             true,
@@ -171,6 +172,7 @@ class PMA_PageSettings
             )
         );
         $retval .= '</div>';
+        $retval .= '</div>';
 
         return $retval;
     }