From 59fd4e0efc9435f7c08cc926e31beee7f2ca8a2c Mon Sep 17 00:00:00 2001 From: Durgesh <007durgesh219@gmail.com> Date: Mon, 8 Feb 2016 11:53:57 +0530 Subject: [PATCH 1/3] Fix Loading... banner shows on login screen, Issue #11906 Signed-off-by: Durgesh <007durgesh219@gmail.com> --- js/functions.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/functions.js b/js/functions.js index 1cf52831abb0..78bbff68d4d8 100644 --- a/js/functions.js +++ b/js/functions.js @@ -872,6 +872,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); } From 9b3a037ff4c7e288ce260890b85f9a2b0c7ce3a5 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Mon, 8 Feb 2016 20:58:37 +0530 Subject: [PATCH 2/3] changelog entry Signed-off-by: Atul Pratap Singh --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 568a9eaf7fbf..02b3f827a1da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,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 From 5a00545bf83f400cf2460c9f36d0ab242438fbb5 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Mon, 8 Feb 2016 21:06:53 +0530 Subject: [PATCH 3/3] Add missing teardown Signed-off-by: Atul Pratap Singh --- js/navigation.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/js/navigation.js b/js/navigation.js index 2851ad48dbfe..a4fd2724b7a4 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -538,6 +538,11 @@ AJAX.registerOnload('navigation.js', function () { } } }); +AJAX.registerTeardown('navigation.js', function () { + if (isStorageSupported('sessionStorage')) { + $(document).off('submit', 'form.config-form'); + } +}); /** * updates the tree state in sessionStorage