From 2f16951634e4ec9e35c240174a27843208bfd589 Mon Sep 17 00:00:00 2001 From: g4b0 Date: Mon, 11 Mar 2013 09:58:14 +0100 Subject: [PATCH] BUG: ampersand escaping --- tests/forms/RequirementsTest.php | 14 +++++++------- view/Requirements.php | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/forms/RequirementsTest.php b/tests/forms/RequirementsTest.php index fd6c5c4e8..e264e85a3 100644 --- a/tests/forms/RequirementsTest.php +++ b/tests/forms/RequirementsTest.php @@ -254,13 +254,13 @@ class RequirementsTest extends SapphireTest { $backend->delete_combined_files('RequirementsTest_bc.js'); $html = $backend->includeInHTML(false, self::$html_template); - + /* Javascript has correct path */ - $this->assertTrue((bool)preg_match('/src=".*\/RequirementsTest_a\.js\?m=\d\d+&test=1&test=2&test=3/', $html), + $this->assertTrue((bool)preg_match('/src=".*\/RequirementsTest_a\.js\?m=\d\d+&test=1&test=2&test=3/', $html), 'javascript has correct path'); /* CSS has correct path */ - $this->assertTrue((bool)preg_match('/href=".*\/RequirementsTest_a\.css\?m=\d\d+&test=1&test=2&test=3/',$html), + $this->assertTrue((bool)preg_match('/href=".*\/RequirementsTest_a\.css\?m=\d\d+&test=1&test=2&test=3/',$html), 'css has correct path'); } @@ -363,17 +363,17 @@ class RequirementsTest extends SapphireTest { $backend->set_suffix_requirements(true); $html = $backend->includeInHTML(false, $template); $this->assertRegexp('/RequirementsTest_a\.js\?m=[\d]*/', $html); - $this->assertRegexp('/RequirementsTest_b\.js\?m=[\d]*&foo=bar&bla=blubb/', $html); + $this->assertRegexp('/RequirementsTest_b\.js\?m=[\d]*&foo=bar&bla=blubb/', $html); $this->assertRegexp('/RequirementsTest_a\.css\?m=[\d]*/', $html); - $this->assertRegexp('/RequirementsTest_b\.css\?m=[\d]*&foo=bar&bla=blubb/', $html); + $this->assertRegexp('/RequirementsTest_b\.css\?m=[\d]*&foo=bar&bla=blubb/', $html); $backend->set_suffix_requirements(false); $html = $backend->includeInHTML(false, $template); $this->assertNotContains('RequirementsTest_a.js=', $html); $this->assertNotRegexp('/RequirementsTest_a\.js\?m=[\d]*/', $html); - $this->assertNotRegexp('/RequirementsTest_b\.js\?m=[\d]*&foo=bar&bla=blubb/', $html); + $this->assertNotRegexp('/RequirementsTest_b\.js\?m=[\d]*&foo=bar&bla=blubb/', $html); $this->assertNotRegexp('/RequirementsTest_a\.css\?m=[\d]*/', $html); - $this->assertNotRegexp('/RequirementsTest_b\.css\?m=[\d]*&foo=bar&bla=blubb/', $html); + $this->assertNotRegexp('/RequirementsTest_b\.css\?m=[\d]*&foo=bar&bla=blubb/', $html); } public function assertFileIncluded($backend, $type, $files) { diff --git a/view/Requirements.php b/view/Requirements.php index 207001fd2..9e80517c3 100644 --- a/view/Requirements.php +++ b/view/Requirements.php @@ -660,7 +660,7 @@ class Requirements_Backend { $this->process_combined_files(); foreach(array_diff_key($this->javascript,$this->blocked) as $file => $dummy) { - $path = $this->path_for_file($file); + $path = Convert::raw2xml($this->path_for_file($file)); if($path) { $jsRequirements .= "\n"; } @@ -677,7 +677,7 @@ class Requirements_Backend { } foreach(array_diff_key($this->css,$this->blocked) as $file => $params) { - $path = $this->path_for_file($file); + $path = Convert::raw2xml($this->path_for_file($file)); if($path) { $media = (isset($params['media']) && !empty($params['media'])) ? " media=\"{$params['media']}\"" : "";