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

Fix EOL conflict in testcase

Browse Source
This commit is contained in:
Herman van Rink
2009-06-29 08:34:06 +00:00
parent 2b01702c04
commit bad1075595
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test/PMA_headerLocation_test.php
View File

@@ -285,15 +285,16 @@ class PMA_headerLocation_test extends PHPUnit_Extensions_OutputTestCase
$GLOBALS['db'] = 'test_db'; $GLOBALS['db'] = 'test_db';
$url = './navigation.php?db='.$GLOBALS['db']; $url = './navigation.php?db='.$GLOBALS['db'];
$write = "\n" . '<script type="text/javascript">' . "\r\n" . $write = PHP_EOL . '<script type="text/javascript">' . PHP_EOL .
'//<![CDATA[' . "\r\n" . '//<![CDATA[' . PHP_EOL .
'if (typeof(window.parent) != \'undefined\'' . "\r\n" . 'if (typeof(window.parent) != \'undefined\'' . PHP_EOL .
' && typeof(window.parent.frame_navigation) != \'undefined\'' . "\r\n" . ' && typeof(window.parent.frame_navigation) != \'undefined\'' . PHP_EOL .
' && window.parent.goTo) {' . "\r\n" . ' && window.parent.goTo) {' . PHP_EOL .
' window.parent.goTo(\'' . $url . '\');' . "\r\n" . ' window.parent.goTo(\'' . $url . '\');' . PHP_EOL .
'}' . "\r\n" . '}' . PHP_EOL .
'//]]>' . "\r\n" . '//]]>' . PHP_EOL .
'</script>' . "\r\n "; '</script>' . PHP_EOL .
" ";
$this->expectOutputString($write); $this->expectOutputString($write);
PMA_reloadNavigation(); PMA_reloadNavigation();