adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 19:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

updatin HtmlHelper::css() to accept .css?1234, closes #3503

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6080 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2007-11-25 20:17:25 +00:00
parent 28ada1f684
commit 101ebba716
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cake/libs/view/helpers/html.php
View file

@ -313,7 +313,12 @@ class HtmlHelper extends AppHelper {
} }
return; return;
} }
$url = $this->webroot((COMPRESS_CSS ? 'c' : '') . CSS_URL . $path . ".css");
if (strpos($path, '.css') === false && strpos($path, '?') === false) {
$path .= '.css';
}
$url = $this->webroot((COMPRESS_CSS ? 'c' : '') . CSS_URL . $path);
if ($rel == 'import') { if ($rel == 'import') {
$out = sprintf($this->tags['style'], $this->_parseAttributes($htmlAttributes, null, '', ' '), '@import url(' . $url . ');'); $out = sprintf($this->tags['style'], $this->_parseAttributes($htmlAttributes, null, '', ' '), '@import url(' . $url . ');');
} else { } else {

14
cake/tests/cases/libs/view/helpers/html.test.php
View file

@ -79,6 +79,20 @@ class HtmlHelperTest extends UnitTestCase {
$this->assertPattern('/^<link[^<>]+type="text\/css"[^<>]+\/>$/', $result); $this->assertPattern('/^<link[^<>]+type="text\/css"[^<>]+\/>$/', $result);
$this->assertPattern('/^<link[^<>]+href=".*css\/screen\.css"[^<>]+\/>$/', $result); $this->assertPattern('/^<link[^<>]+href=".*css\/screen\.css"[^<>]+\/>$/', $result);
$this->assertNoPattern('/^<link[^<>]+[^rel|type|href]=[^<>]*>/', $result); $this->assertNoPattern('/^<link[^<>]+[^rel|type|href]=[^<>]*>/', $result);
$result = $this->Html->css('screen.css');
$this->assertPattern('/^<link[^<>]+\/>$/', $result);
$this->assertPattern('/^<link[^<>]+rel="stylesheet"[^<>]+\/>$/', $result);
$this->assertPattern('/^<link[^<>]+type="text\/css"[^<>]+\/>$/', $result);
$this->assertPattern('/^<link[^<>]+href=".*css\/screen\.css"[^<>]+\/>$/', $result);
$this->assertNoPattern('/^<link[^<>]+[^rel|type|href]=[^<>]*>/', $result);
$result = $this->Html->css('screen.css?1234');
$this->assertPattern('/^<link[^<>]+\/>$/', $result);
$this->assertPattern('/^<link[^<>]+rel="stylesheet"[^<>]+\/>$/', $result);
$this->assertPattern('/^<link[^<>]+type="text\/css"[^<>]+\/>$/', $result);
$this->assertPattern('/^<link[^<>]+href=".*css\/screen\.css\?1234"[^<>]+\/>$/', $result);
$this->assertNoPattern('/^<link[^<>]+[^rel|type|href]=[^<>]*>/', $result);
} }
function testBreadcrumb() { function testBreadcrumb() {