diff options
| -rw-r--r-- | core/js/js.js | 3 | ||||
| -rw-r--r-- | lib/base.php | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/core/js/js.js b/core/js/js.js index a1ad0c77184..7a53bb75ef5 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -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{ 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), '/'); } |