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

This commit is contained in:
Weblate 2016-02-08 16:43:39 +01:00
commit 5f1a5ac2ca
3 changed files with 9 additions and 0 deletions

View File

@ -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

View File

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

View File

@ -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.