gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed config tab persistence errors

Browse Source 
The URL hash can get appended php session ID breaking the hash lookup.

Fixes #12215

Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2016-04-26 10:29:58 +02:00
parent 53a51b953c
commit fc8486094c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -20,6 +20,7 @@ phpMyAdmin - ChangeLog
- issue #12206 Fixed loading of configuration file
- issue #12204 Check if sessions are working and report failures
- issue #12211 non-clickable initial letter for users / and can't modify users with MySQL 5.7.12
- issue #12215 Fixed config tab persistence errors
4.6.0.0 (2016-03-22)
+ issue #11456 Disabled storage engines

8
js/config.js
View File

@ -624,8 +624,12 @@ AJAX.registerOnload('config.js', function () {
var tab_check_fnc = function () {
if (location.hash != prev_hash) {
prev_hash = location.hash;
if (location.hash.match(/^#tab_[a-zA-Z0-9_]+/) && $('#' + location.hash.substr(5)).length) {
setTab(location.hash.substr(5));
if (location.hash.match(/^#tab_[a-zA-Z0-9_]+/)) {
// session ID is sometimes appended here
var hash = location.hash.substr(5).split('&')[0];
if ($('#' + hash).length) {
setTab(hash);
}
}
}
};