diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-06-16 09:35:53 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-06-16 09:35:53 +0200 |
| commit | a6531d0311d6401562827ed12da6cdc8560b70f7 (patch) | |
| tree | f188258612a15c28954d0873583b59dc199c5c13 /lib/base.php | |
| parent | fbd45a939fc52bf2e2865a35122b8abbb009b2b4 (diff) | |
| parent | bf2062b09d6c3a3d1c8b94b3612b6bb940aa5b79 (diff) | |
| download | nextcloud-server-a6531d0311d6401562827ed12da6cdc8560b70f7.tar.gz nextcloud-server-a6531d0311d6401562827ed12da6cdc8560b70f7.zip | |
Merge branch 'master' into calendar_repeat
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/base.php b/lib/base.php index f85710ddfcf..fedc1238851 100644 --- a/lib/base.php +++ b/lib/base.php @@ -121,8 +121,7 @@ class OC{ } public static function initPaths(){ - // calculate the documentroot - $DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']); + // calculate the root directories OC::$SERVERROOT=str_replace("\\",'/',substr(__FILE__,0,-13)); OC::$SUBURI= str_replace("\\","/",substr(realpath($_SERVER["SCRIPT_FILENAME"]),strlen(OC::$SERVERROOT))); $scriptName=$_SERVER["SCRIPT_NAME"]; @@ -137,9 +136,6 @@ class OC{ } } OC::$WEBROOT=substr($scriptName,0,strlen($scriptName)-strlen(OC::$SUBURI)); - // try a new way to detect the WEBROOT which is simpler and also works with the app directory outside the owncloud folder. let´s see if this works for everybody -// OC::$WEBROOT=substr(OC::$SERVERROOT,strlen($DOCUMENTROOT)); - if(OC::$WEBROOT!='' and OC::$WEBROOT[0]!=='/'){ OC::$WEBROOT='/'.OC::$WEBROOT; |