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

Merge branch 'QA_4_6' into QA_4_6-security

Browse Source
This commit is contained in:
Michal Čihař 2016-06-15 13:03:21 +02:00
commit 19eef4eebb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/libraries/PMA_user_preferences_test.php
View File

@ -33,6 +33,7 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
function setUp()
{
$GLOBALS['server'] = 0;
$GLOBALS['PMA_PHP_SELF'] = '/phpmyadmin/';
}
/**
@ -378,7 +379,7 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
);
$this->assertContains(
'Location: ./file.html?a=b&saved=1&server=0&' .
'Location: /phpmyadmin/file.html?a=b&saved=1&server=0&' .
'token=token#h+ash',
$GLOBALS['header'][0]
);