Fixes for multi app dir :

Url should be given as relative path (to webroot)
Correct link construction from js

diff --git a/core/js/js.js b/core/js/js.js
index a1ad0c77184cddebf33b56698bd7364afa031c77..7a53bb75ef5ec871d3c22b72814a4fc838aeca0a 100644 (file)
--- 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 22dd86535a02a54150a6695aa210c9d08181cf6b..870550f267d2f1c56352a0831694c1a53fab02c6 100644 (file)
--- 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), '/');
                }