From 0668b6d8bc584f251df4b2c2bec3b578efbd0e86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Thu, 18 Oct 2012 10:39:35 +0200
Subject: [PATCH] Use same logic as master for testsuite

---
 libraries/Config.class.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 24a364d411..2f4174743e 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -1344,6 +1344,12 @@ class PMA_Config
      */
     function removeCookie($cookie)
     {
+        if (defined('TESTSUITE')) {
+            if (isset($_COOKIE[$cookie])) {
+                unset($_COOKIE[$cookie]);
+            }
+            return true;
+        }
         return setcookie(
             $cookie,
             '',
@@ -1368,9 +1374,6 @@ class PMA_Config
      */
     function setCookie($cookie, $value, $default = null, $validity = null, $httponly = true)
     {
-        if (defined('TESTSUITE')) {
-            return true;
-        }
         if ($validity == null) {
             $validity = 2592000;
         }
@@ -1396,6 +1399,10 @@ class PMA_Config
             } else {
                 $v = time() + $validity;
             }
+            if (defined('TESTSUITE')) {
+                $_COOKIE[$cookie] = $value;
+                return true;
+            }
             return setcookie(
                 $cookie,
                 $value,