wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes for multi app dir :

Browse source 
Url should be given as relative path (to webroot)
Correct link construction from js
This commit is contained in:
Brice Maron 2012-06-22 12:24:10 +02:00
parent 8c28aec664
commit df60d6d5d2
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/js/js.js
View file

@ -64,9 +64,8 @@ OC={
}
}else if(file.substring(file.length-3) != 'php' && !isCore){
link=OC.appswebroots[app];
link+='/'+app+'/';
if(type){
link+=type+'/';
link+= '/'+type+'/';
}
link+=file;
}else{

4
lib/base.php
View file

@ -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), '/');
}