From f4e3edb1e04e95491e1c06193df8d6b8bbe277b6 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Fri, 18 Oct 2013 12:30:57 -0400
Subject: [PATCH] Fixes #1004.

---
 framework/yii/web/AssetBundle.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/framework/yii/web/AssetBundle.php b/framework/yii/web/AssetBundle.php
index cb6465c..6bd7bff 100644
--- a/framework/yii/web/AssetBundle.php
+++ b/framework/yii/web/AssetBundle.php
@@ -139,10 +139,18 @@ class AssetBundle extends Object
 	public function registerAssets($view)
 	{
 		foreach ($this->js as $js) {
-			$view->registerJsFile($this->baseUrl . '/' . ltrim($js, '/'), $this->jsOptions);
+			if ($js[0] === '/') {
+				$view->registerJsFile($this->baseUrl . $js, $this->jsOptions);
+			} else {
+				$view->registerJsFile($this->baseUrl . '/' . $js, $this->jsOptions);
+			}
 		}
 		foreach ($this->css as $css) {
-			$view->registerCssFile($this->baseUrl . '/' . ltrim($css, '/'), $this->cssOptions);
+			if ($css[0] === '/') {
+				$view->registerCssFile($this->baseUrl . $css, $this->cssOptions);
+			} else {
+				$view->registerCssFile($this->baseUrl . '/' . $css, $this->cssOptions);
+			}
 		}
 	}