Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorHugues Peccatte <hugues.peccatte@gmail.com>2015-07-19 22:53:34 +0300
committerHugues Peccatte <hugues.peccatte@gmail.com>2015-07-19 22:53:34 +0300
commit7ae011d1a51ac9e6c3f1b201adfac74b54c52ad0 (patch)
treec1555a1d8105fa71652f11a99935190109104fdf /test
parentf8eb5b71c9c3bfcb18d537d0325f3b133c1ae902 (diff)
parentad59cb9c2026d3f27869599dd2337f718a1332d1 (diff)
Merge pull request #1794 from Tithugues/templatingHeaderLocation
Templating header location
Diffstat (limited to 'test')
-rw-r--r--test/libraries/core/PMA_headerLocation_test.php31
1 files changed, 11 insertions, 20 deletions
diff --git a/test/libraries/core/PMA_headerLocation_test.php b/test/libraries/core/PMA_headerLocation_test.php
index 925ebcbf9b..7eb69d98f4 100644
--- a/test/libraries/core/PMA_headerLocation_test.php
+++ b/test/libraries/core/PMA_headerLocation_test.php
@@ -257,26 +257,17 @@ class PMA_HeaderLocation_Test extends PHPUnit_Framework_TestCase
$testUri_html = htmlspecialchars($testUri);
$testUri_js = PMA_escapeJsString($testUri);
- $header = "<html><head><title>- - -</title>\n" .
- "<meta http-equiv=\"expires\" content=\"0\">\n" .
- "<meta http-equiv=\"Pragma\" content=\"no-cache\">\n" .
- "<meta http-equiv=\"Cache-Control\" content=\"no-cache\">\n" .
- "<meta http-equiv=\"Refresh\" content=\"0;url=" . $testUri_html
- . "\">\n" .
- "<script type=\"text/javascript\">\n" .
- "//<![CDATA[\n" .
- "setTimeout(\"window.location = unescape('\"" . $testUri_js
- . "\"')\", 2000);\n" .
- "//]]>\n" .
- "</script>\n" .
- "</head>\n" .
- "<body>\n" .
- "<script type=\"text/javascript\">\n" .
- "//<![CDATA[\n" .
- "document.write('<p><a href=\"" . $testUri_html . "\">"
- . __('Go') . "</a></p>');\n" .
- "//]]>\n" .
- "</script></body></html>\n";
+ $header = "<html><head><title>- - -</title>
+ <meta http-equiv=\"expires\" content=\"0\">"
+ . "<meta http-equiv=\"Pragma\" content=\"no-cache\">"
+ . "<meta http-equiv=\"Cache-Control\" content=\"no-cache\">"
+ . "<meta http-equiv=\"Refresh\" content=\"0;url=" . $testUri_html . "\">"
+ . "<script type=\"text/javascript\">//<![CDATA[
+ setTimeout(\"window.location = unescape('" . $testUri_js . "')\", 2000);
+ //]]></script></head>
+<body><script type=\"text/javascript\">//<![CDATA[
+ document.write('<p><a href=\"" . $testUri_html . "\">" . __('Go') . "</a></p>');
+ //]]></script></body></html>";
$this->expectOutputString($header);