diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-06-15 23:14:48 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-06-15 23:14:48 +0000 |
| commit | 8484e165167050ad19b8f2f083c04ff0d4a60755 (patch) | |
| tree | 61bfd975e93c579e9e4434e1d8494f02c0d1998f /lib | |
| parent | e37ef6dd473eaedcdf2814445ae12fb39786d585 (diff) | |
| parent | 4268fe61bad04a873a8f161937128dbae1eae741 (diff) | |
| download | nextcloud-server-8484e165167050ad19b8f2f083c04ff0d4a60755.tar.gz nextcloud-server-8484e165167050ad19b8f2f083c04ff0d4a60755.zip | |
Merge branch 'master' of gitorious.org:owncloud/owncloud
Diffstat (limited to 'lib')
| -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; |