diff --git a/CHANGELOG b/CHANGELOG index c1c4ac37f..e1360026f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,7 +4,7 @@ Version 1.1.8 work in progress ------------------------------ - +- Bug: Fixed a typo that may cause issue when setting custom script packages with baseUrl option for CClientScript (Qiang) Version 1.1.7 March 27, 2011 ---------------------------- diff --git a/framework/web/CClientScript.php b/framework/web/CClientScript.php index 272d63e30..bd9805923 100644 --- a/framework/web/CClientScript.php +++ b/framework/web/CClientScript.php @@ -308,7 +308,7 @@ class CClientScript extends CApplicationComponent { $baseUrl=$package['baseUrl']; if($baseUrl==='' || $baseUrl[0]!=='/') - $baseUrl=Yii::app()->getRequest()->getBaseUrl.'/'.$baseUrl; + $baseUrl=Yii::app()->getRequest()->getBaseUrl().'/'.$baseUrl; $baseUrl=rtrim($baseUrl,'/'); } else if(isset($package['basePath']))