summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorxue <>2007-10-01 00:36:08 +0000
committerxue <>2007-10-01 00:36:08 +0000
commit769c6663a77893cfbc2270db8ba0d506ea5e493f (patch)
tree81f69055a413e3b9f5863568b5b2a8917e469489 /framework
parentd95aa569554d41e8b1b2cb23068908b582ead545 (diff)
revert.
Diffstat (limited to 'framework')
-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);
+ }
}
/**