From 2af3f4de05875a23a7f5dadceaa64e6c0ec84c8b Mon Sep 17 00:00:00 2001
From: xue <>
Date: Mon, 1 Oct 2007 00:33:28 +0000
Subject: prepare for next release.

---
 framework/PradoBase.php                   |  2 +-
 framework/Web/UI/TClientScriptManager.php | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'framework')

diff --git a/framework/PradoBase.php b/framework/PradoBase.php
index d4f2522c..514a8a9a 100644
--- a/framework/PradoBase.php
+++ b/framework/PradoBase.php
@@ -66,7 +66,7 @@ class PradoBase
 	 */
 	public static function getVersion()
 	{
-		return '3.1.1';
+		return '3.1.2a';
 	}
 
 	/**
diff --git a/framework/Web/UI/TClientScriptManager.php b/framework/Web/UI/TClientScriptManager.php
index 8b2bdae0..6d4775bf 100644
--- a/framework/Web/UI/TClientScriptManager.php
+++ b/framework/Web/UI/TClientScriptManager.php
@@ -205,7 +205,16 @@ class TClientScriptManager extends TApplicationComponent
 	protected function getPackagePathUrl($base)
 	{
 		$assets = Prado::getApplication()->getAssetManager();
-		return array($assets->getPublishedPath($base), $assets->publishFilePath($base));
+		if(strpos($base, $assets->getBaseUrl())===false)
+		{
+			if(!is_null($dir = Prado::getPathOfNameSpace($base)))
+				$base = $dir;
+			return array($assets->getPublishedPath($base), $assets->publishFilePath($base));
+		}
+		else
+		{
+			return array($assets->getBasePath().str_replace($assets->getBaseUrl(),'',$base), $base);
+		}
 	}
 
 	/**
-- 
cgit v1.2.3