From 1bc5daba808067a1db85ab8b8a401c217c9a8097 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sat, 26 Nov 2005 03:04:23 +0000
Subject:

---
 framework/Web/TThemeManager.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'framework/Web/TThemeManager.php')

diff --git a/framework/Web/TThemeManager.php b/framework/Web/TThemeManager.php
index 5d7319e8..0a54cf8e 100644
--- a/framework/Web/TThemeManager.php
+++ b/framework/Web/TThemeManager.php
@@ -150,7 +150,7 @@ class TThemeManager extends TComponent implements IModule
 			if(strpos($basePath,$appPath)===false)
 				throw new TConfigurationException('thememanager_baseurl_required');
 			$appUrl=dirname($this->_application->getRequest()->getApplicationPath());
-			$this->_baseUrl=$appUrl.'/'.strtr(substr($basePath,strlen($appPath)),'\\','/');
+			$this->_baseUrl=$appUrl.strtr(substr($basePath,strlen($appPath)),'\\','/');
 		}
 		return $this->_baseUrl;
 	}
@@ -306,7 +306,7 @@ class TTheme extends TComponent
 					if($value[0]===1)
 						$value=$this->evaluateExpression($value[1]);
 					else if($value[0]===2)
-						$value=$this->_themeUrl.'/'.$value[1];
+						$value=$this->_themeUrl.'/'.ltrim($value[1],'/');
 				}
 				if(strpos($name,'.')===false)	// is simple property or custom attribute
 				{
-- 
cgit v1.2.3