From bad10755953ccf55be80fa9e63c5cbc3d6a003d8 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Mon, 29 Jun 2009 08:34:06 +0000
Subject: [PATCH] Fix EOL conflict in testcase

---
 test/PMA_headerLocation_test.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

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