adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 00:48:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '1.3' into 1.3-misc

Browse source
This commit is contained in:
mark_story 2009-11-06 09:25:11 -05:00
commit ab76cb1217
4 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
app/views/elements/email/html/empty Normal file
View file

0
app/views/elements/email/text/empty Normal file
View file

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

@ -406,7 +406,7 @@ class HtmlHelper extends AppHelper {
if ($rel == null) {
$rel = 'stylesheet';
}
$out = sprintf($this->tags['css'], $rel, $url, $this->_parseAttributes($options, null, '', ' '));
$out = sprintf($this->tags['css'], $rel, $url, $this->_parseAttributes($options, array('inline'), '', ' '));
}
$out = $this->output($out);

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

@ -421,11 +421,17 @@ class HtmlHelperTest extends CakeTestCase {
$this->assertTags($result[1], $expected);
$this->assertEqual(count($result), 2);
$view =& ClassRegistry::getObject('view');
ClassRegistry::removeObject('view');
$view =& new HtmlHelperMockView();
ClassRegistry::addObject('view', $view);
$view->expectAt(0, 'addScript', array(new PatternExpectation('/css_in_head.css/')));
$result = $this->Html->css('css_in_head', null, array('inline' => false));
$this->assertNull($result);
$view =& ClassRegistry::getObject('view');
$view->expectAt(1, 'addScript', array(new NoPatternExpectation('/inline=""/')));
$result = $this->Html->css('more_css_in_head', null, array('inline' => false));
$this->assertNull($result);
}
/**