diff options
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/base.php b/lib/base.php index 870550f267d..b4da6434e25 100644 --- a/lib/base.php +++ b/lib/base.php @@ -136,14 +136,16 @@ class OC{ $config_paths = OC_Config::getValue('apps_paths', array()); if(! empty($config_paths)){ foreach($config_paths as $paths) { - if( isset($paths['url']) && isset($paths['path'])) - OC::$APPSROOTS[] = $paths; + if( isset($paths['url']) && isset($paths['path'])) { + $paths['url'] = rtrim($paths['url'],'/'); + $paths['path'] = rtrim($paths['path'],'/'); + OC::$APPSROOTS[] = $paths; + } } }elseif(file_exists(OC::$SERVERROOT.'/apps')){ - OC::$APPSROOTS[] = array('path'=> OC::$SERVERROOT.'/apps', 'url' => '/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' => '/apps/', 'writable' => true); - OC::$APPSROOT=rtrim(dirname(OC::$SERVERROOT), '/'); + OC::$APPSROOTS[] = array('path'=> rtrim(dirname(OC::$SERVERROOT), '/').'/apps', 'url' => '/apps', 'writable' => true); } if(empty(OC::$APPSROOTS)){ |