From a2bb6b40fa09b9d25a610ea71854bfd06ee538cf Mon Sep 17 00:00:00 2001
From: xue <>
Date: Tue, 7 Feb 2006 02:31:27 +0000
Subject: Fixed a bug in generating URLs with double slashes.

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

(limited to 'framework/Web/UI/TAssetManager.php')

diff --git a/framework/Web/UI/TAssetManager.php b/framework/Web/UI/TAssetManager.php
index cd25a74c..c0a85b2b 100644
--- a/framework/Web/UI/TAssetManager.php
+++ b/framework/Web/UI/TAssetManager.php
@@ -81,7 +81,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=dirname($application->getRequest()->getApplicationPath()).'/'.self::DEFAULT_BASEPATH;
+			$this->_baseUrl=rtrim(dirname($application->getRequest()->getApplicationPath()),'/').'/'.self::DEFAULT_BASEPATH;
 		$application->getService()->setAssetManager($this);
 	}
 
@@ -128,7 +128,7 @@ class TAssetManager extends TModule
 		if($this->_initialized)
 			throw new TInvalidOperationException('assetmanager_baseurl_unchangeable');
 		else
-			$this->_baseUrl=$value;
+			$this->_baseUrl=rtrim($value,'/');
 	}
 
 	public function getPublishedUrl($path)
-- 
cgit v1.2.3