Merge remote-tracking branch 'origin/master'

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
     });
 }

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;
     }