From 22f844c48f3a37948470d0c177d9768fc83a8aaf Mon Sep 17 00:00:00 2001 From: AD7six Date: Sun, 15 Jan 2012 01:03:17 +0100 Subject: [PATCH] prevent block="css" when using inline=false css --- lib/Cake/View/Helper/HtmlHelper.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Cake/View/Helper/HtmlHelper.php b/lib/Cake/View/Helper/HtmlHelper.php index 3645b581e..dd41a465b 100644 --- a/lib/Cake/View/Helper/HtmlHelper.php +++ b/lib/Cake/View/Helper/HtmlHelper.php @@ -232,7 +232,7 @@ class HtmlHelper extends AppHelper { * * ### Options * - * - `inline` Whether or not the link element should be output inline. Set to false to + * - `inline` Whether or not the link element should be output inline. Set to false to * have the meta tag included in `$scripts_for_layout`, and appended to the 'meta' view block. * - `block` Choose a custom block to append the meta tag to. Using this option * will override the inline option. @@ -401,7 +401,7 @@ class HtmlHelper extends AppHelper { * * ### Options * - * - `inline` If set to false, the generated tag will be appended to the 'css' block, + * - `inline` If set to false, the generated tag will be appended to the 'css' block, * and included in the `$scripts_for_layout` layout variable. Defaults to true. * - `block` Set the name of the block link/style tag will be appended to. This overrides the `inline` * option. @@ -455,12 +455,12 @@ class HtmlHelper extends AppHelper { } if ($rel == 'import') { - $out = sprintf($this->_tags['style'], $this->_parseAttributes($options, array('inline'), '', ' '), '@import url(' . $url . ');'); + $out = sprintf($this->_tags['style'], $this->_parseAttributes($options, array('inline', 'block'), '', ' '), '@import url(' . $url . ');'); } else { if ($rel == null) { $rel = 'stylesheet'; } - $out = sprintf($this->_tags['css'], $rel, $url, $this->_parseAttributes($options, array('inline'), '', ' ')); + $out = sprintf($this->_tags['css'], $rel, $url, $this->_parseAttributes($options, array('inline', 'block'), '', ' ')); } if (empty($options['block'])) {