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

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

Browse Source
This commit is contained in:
Weblate 2015-10-10 03:05:34 +02:00
commit 167022cb67
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -31,6 +31,7 @@ phpMyAdmin - ChangeLog
- issue #11542 Import parser and backslash
- issue #11546 "Visualize GIS data" seems to be broken
- issue #11548 Confirm box on "Reset slave" option
- issue Fix cookies clearing on version change
4.5.0.2 (2015-09-25)
- issue #11497 Incorrect indexes when exporting

19
libraries/common.inc.php
View File

@ -314,16 +314,17 @@ $GLOBALS['PMA_Config']->enableBc();
* when changing something related to PMA cookies, increment the cookie version
*/
$pma_cookie_version = 4;
if (isset($_COOKIE)
&& (isset($_COOKIE['pmaCookieVer'])
&& $_COOKIE['pmaCookieVer'] < $pma_cookie_version)
) {
// delete all cookies
foreach ($_COOKIE as $cookie_name => $tmp) {
$GLOBALS['PMA_Config']->removeCookie($cookie_name);
if (isset($_COOKIE)) {
if (! isset($_COOKIE['pmaCookieVer'])
|| $_COOKIE['pmaCookieVer'] != $pma_cookie_version
) {
// delete all cookies
foreach ($_COOKIE as $cookie_name => $tmp) {
$GLOBALS['PMA_Config']->removeCookie($cookie_name);
}
$_COOKIE = array();
$GLOBALS['PMA_Config']->setCookie('pmaCookieVer', $pma_cookie_version);
}
$_COOKIE = array();
$GLOBALS['PMA_Config']->setCookie('pmaCookieVer', $pma_cookie_version);
}