From: Brice Maron <brice@bmaron.net>
Date: Mon, 25 Jun 2012 13:50:27 +0000 (+0200)
Subject: Trim url and path of appsroot to have and standart type of path fix oc-1107
X-Git-Tag: v4.5.0beta1~74^2~403^2~21
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=09a9f5400e011ed691a7f4faca03f39ac3b5e7ba;p=nextcloud-server.git

Trim url and path of appsroot to have and standart type of path fix oc-1107
---

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)){