merge from 1.0

This commit is contained in:
qiang.xue
2009-02-28 18:23:17 +00:00
parent 9c9715203c
commit 66cc52b90d
6 changed files with 8 additions and 8 deletions

View File

@@ -456,6 +456,7 @@ class CClientScript extends CApplicationComponent
*/
public function registerLinkTag($relation=null,$type=null,$href=null,$media=null,$options=array())
{
$this->_hasScripts=true;
if($relation!==null)
$options['rel']=$relation;
if($type!==null)