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

Use same logic as master for testsuite

Browse Source
This commit is contained in:
Michal Čihař 2012-10-18 10:39:35 +02:00
parent 048d2de2ba
commit 0668b6d8bc
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/Config.class.php
View File

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