some path fixes for multi-dir app
This commit is contained in:
parent
b5953e7a83
commit
ba2d203a54
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue