Merge remote-tracking branch 'origin/QA_4_5' into QA_4_6

phpmyadmin · Feb 8, 2016 · 29edefa · 29edefa
2 parents 9a22f5a + 5a00545
commit 29edefa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -47,6 +47,7 @@ phpMyAdmin - ChangeLog
 - issue #11874 Validate version information before further processing it
 - issue #11881 Full processlist lost on refresh
 - issue #11834 Adjust privileges fails if database name contains underscores
+- issue #11906 'Loading...' banner shows on login screen
 
 4.5.4.1 (2016-01-29)
 - issue #11892 Error with PMA 4.4.15.3

diff --git a/js/functions.js b/js/functions.js
@@ -901,6 +901,9 @@ AJAX.registerOnload('functions.js', function () {
                             updateTimeout = window.setTimeout(UpdateIdleTime, 2000);
                         }
                     } else { //timeout occurred
+                        if(isStorageSupported('sessionStorage')){
+                            window.sessionStorage.clear();
+                        }
                         window.location.reload(true);
                         clearInterval(IncInterval);
                     }

diff --git a/js/navigation.js b/js/navigation.js
@@ -564,6 +564,11 @@ AJAX.registerOnload('navigation.js', function () {
         }
     }
 });
+AJAX.registerTeardown('navigation.js', function () {
+    if (isStorageSupported('sessionStorage')) {
+        $(document).off('submit', 'form.config-form');
+    }
+});
 
 /**
  * Expands a node in navigation tree.