Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Mueller <thomas.mueller@tmit.eu>2012-06-22 11:56:54 +0400
committerThomas Mueller <thomas.mueller@tmit.eu>2012-06-22 11:56:54 +0400
commitba2d203a543bdbf1c029b48485a59cb5e898d630 (patch)
tree75560e71f2329a4999d4fdf71c1f164109ac49da /lib/templatelayout.php
parentb5953e7a83d2dc8f1483c7809414dca7a1cde990 (diff)
some path fixes for multi-dir app
Diffstat (limited to 'lib/templatelayout.php')
-rw-r--r--lib/templatelayout.php4
1 files changed, 2 insertions, 2 deletions
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);