summaryrefslogtreecommitdiff
path: root/framework/Web/UI
diff options
context:
space:
mode:
authorxue <>2007-10-01 00:33:28 +0000
committerxue <>2007-10-01 00:33:28 +0000
commit2af3f4de05875a23a7f5dadceaa64e6c0ec84c8b (patch)
tree92170452cc0da1c5e506dc85f9335d75662037b7 /framework/Web/UI
parent81db1a66aaf17b1355613c9fc5f0888e1140b4a8 (diff)
prepare for next release.
Diffstat (limited to 'framework/Web/UI')
-rw-r--r--framework/Web/UI/TClientScriptManager.php11
1 files changed, 10 insertions, 1 deletions
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);
+ }
}
/**