From 9e17c72bc1c6f917f032b61a16907c81ac49f322 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Tue, 14 Feb 2006 02:48:11 +0000
Subject: Fixed a bug about base url calculation.

---
 framework/Web/UI/TAssetManager.php | 2 +-
 framework/Web/UI/TThemeManager.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/Web/UI/TAssetManager.php b/framework/Web/UI/TAssetManager.php
index d9a0bc4c..3e341a5e 100644
--- a/framework/Web/UI/TAssetManager.php
+++ b/framework/Web/UI/TAssetManager.php
@@ -85,7 +85,7 @@ class TAssetManager extends TModule
 		if(!is_writable($this->_basePath) || !is_dir($this->_basePath))
 			throw new TConfigurationException('assetmanager_basepath_invalid',$this->_basePath);
 		if($this->_baseUrl===null)
-			$this->_baseUrl=rtrim(dirname($application->getRequest()->getApplicationPath()),'/').'/'.self::DEFAULT_BASEPATH;
+			$this->_baseUrl=rtrim(dirname($application->getRequest()->getApplicationPath()),'/\\').'/'.self::DEFAULT_BASEPATH;
 		$application->getService()->setAssetManager($this);
 		$this->_initialized=true;
 	}
diff --git a/framework/Web/UI/TThemeManager.php b/framework/Web/UI/TThemeManager.php
index 51796046..37e477d9 100644
--- a/framework/Web/UI/TThemeManager.php
+++ b/framework/Web/UI/TThemeManager.php
@@ -123,7 +123,7 @@ class TThemeManager extends TModule
 			$basePath=$this->getBasePath();
 			if(strpos($basePath,$appPath)===false)
 				throw new TConfigurationException('thememanager_baseurl_required');
-			$appUrl=rtrim(dirname($this->getRequest()->getApplicationPath()),'/');
+			$appUrl=rtrim(dirname($this->getRequest()->getApplicationPath()),'/\\');
 			$this->_baseUrl=$appUrl.strtr(substr($basePath,strlen($appPath)),'\\','/');
 		}
 		return $this->_baseUrl;
-- 
cgit v1.2.3