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

phpmyadmin · Oct 10, 2015 · 167022c · 167022c
2 parents f33af5a + 3003a35
commit 167022c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -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

diff --git a/libraries/common.inc.php b/libraries/common.inc.php
@@ -314,16 +314,17 @@
  * 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);
 }