From cef955c8b912248d8dc45479668fb08420d74fb7 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 30 Apr 2013 00:33:21 +0200 Subject: [PATCH] Removed stray ampersand in Requirements (fixes #1809) Only happens with suffix_requirements=true --- tests/forms/RequirementsTest.php | 16 ++++++++-------- view/Requirements.php | 2 ++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/forms/RequirementsTest.php b/tests/forms/RequirementsTest.php index 003728455..6239c3ae5 100644 --- a/tests/forms/RequirementsTest.php +++ b/tests/forms/RequirementsTest.php @@ -362,18 +362,18 @@ 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_a\.css\?m=[\d]*/', $html); - $this->assertRegexp('/RequirementsTest_b\.css\?m=[\d]*&foo=bar&bla=blubb/', $html); + $this->assertRegexp('/RequirementsTest_a\.js\?m=[\d]*"/', $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); $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_a\.css\?m=[\d]*/', $html); - $this->assertNotRegexp('/RequirementsTest_b\.css\?m=[\d]*&foo=bar&bla=blubb/', $html); + $this->assertNotRegexp('/RequirementsTest_a\.js\?m=[\d]*"/', $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); } public function assertFileIncluded($backend, $type, $files) { diff --git a/view/Requirements.php b/view/Requirements.php index 5b860c182..c86cf74a6 100644 --- a/view/Requirements.php +++ b/view/Requirements.php @@ -810,6 +810,8 @@ class Requirements_Backend { } $suffix .= substr($fileOrUrl, strpos($fileOrUrl, '?')+1); $fileOrUrl = substr($fileOrUrl, 0, strpos($fileOrUrl, '?')); + } else { + $suffix = ''; } return "{$prefix}{$fileOrUrl}{$mtimesuffix}{$suffix}"; } else {