summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBrice Maron <brice@bmaron.net>2012-06-22 12:24:10 +0200
committerBrice Maron <brice@bmaron.net>2012-06-22 12:24:56 +0200
commitdf60d6d5d2e905d3df9095d244e756fd60fd8c01 (patch)
tree31c3b0213d7b7ee43ade8117eb19410ea463a3f2 /lib
parent8c28aec664612c4deab7eb79acfe293a77839417 (diff)
downloadnextcloud-server-df60d6d5d2e905d3df9095d244e756fd60fd8c01.tar.gz
nextcloud-server-df60d6d5d2e905d3df9095d244e756fd60fd8c01.zip
Fixes for multi app dir :
Url should be given as relative path (to webroot) Correct link construction from js
Diffstat (limited to 'lib')
-rw-r--r--lib/base.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php
index 22dd86535a0..870550f267d 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -140,9 +140,9 @@ class OC{
OC::$APPSROOTS[] = $paths;
}
}elseif(file_exists(OC::$SERVERROOT.'/apps')){
- OC::$APPSROOTS[] = array('path'=> OC::$SERVERROOT.'/apps', 'url' => OC::$WEBROOT.'/apps/', 'writable' => true);
+ OC::$APPSROOTS[] = array('path'=> OC::$SERVERROOT.'/apps', 'url' => '/apps/', 'writable' => true);
}elseif(file_exists(OC::$SERVERROOT.'/../apps')){
- OC::$APPSROOTS[] = array('path'=> rtrim(dirname(OC::$SERVERROOT), '/').'/apps', 'url' => rtrim(dirname(OC::$WEBROOT), '/').'/apps/', 'writable' => true);
+ OC::$APPSROOTS[] = array('path'=> rtrim(dirname(OC::$SERVERROOT), '/').'/apps', 'url' => '/apps/', 'writable' => true);
OC::$APPSROOT=rtrim(dirname(OC::$SERVERROOT), '/');
}