merge from 1.0

This commit is contained in:
qiang.xue
2009-11-10 22:54:46 +00:00
parent 2d408409f3
commit bc12b73f51
19 changed files with 456 additions and 13 deletions

View File

@@ -219,9 +219,9 @@ class CClientScript extends CApplicationComponent
{
$html='';
foreach($this->_metas as $meta)
$html.=CHtml::metaTag($meta['content'],null,null,$meta);
$html.=CHtml::metaTag($meta['content'],null,null,$meta)."\n";
foreach($this->_links as $link)
$html.=CHtml::linkTag(null,null,null,null,$link);
$html.=CHtml::linkTag(null,null,null,null,$link)."\n";
foreach($this->cssFiles as $url=>$media)
$html.=CHtml::cssFile($url,$media)."\n";
foreach($this->_css as $css)