diff options
| -rwxr-xr-x | lib/app.php | 2 | ||||
| -rw-r--r-- | lib/templatelayout.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/app.php b/lib/app.php index 071ac83b4f2..486704a2229 100755 --- a/lib/app.php +++ b/lib/app.php @@ -370,7 +370,7 @@ class OC_App{ */ public static function getAppWebPath($appid) { if( ($dir = self::findAppInDirectories($appid)) != false) { - return $dir['url'].'/'.$appid; + return OC::$WEBROOT.$dir['url'].'/'.$appid; } } diff --git a/lib/templatelayout.php b/lib/templatelayout.php index 6e1d435f671..d33a87e9e4c 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -181,8 +181,8 @@ class OC_TemplateLayout extends OC_Template { // Is it part of an app? $append = false; foreach( OC::$APPSROOTS as $apps_dir) { - if(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$script$fext.js")) { $append =true; break; } - elseif(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$script.js")) { $append =true; break; } + if(self::appendIfExist($files, $apps_dir['path'], OC::$WEBROOT.$apps_dir['url'], "$script$fext.js")) { $append =true; break; } + elseif(self::appendIfExist($files, $apps_dir['path'], OC::$WEBROOT.$apps_dir['url'], "$script.js")) { $append =true; break; } } if(! $append) { echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT); |