From 97233b77cd0cfb7671e8914fd047642988ea425b Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 11 May 2012 21:31:51 +0200
Subject: [PATCH] Remove DOCUMENTROOT static var, and make SUBURI var private
---
lib/base.php | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/lib/base.php b/lib/base.php
index e7ca51740c..f01e1f5be6 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -30,10 +30,6 @@ class OC{
* Assoziative array for autoloading. classname => filename
*/
public static $CLASSPATH = array();
- /**
- * $_SERVER['DOCUMENTROOT'] but without symlinks
- */
- public static $DOCUMENTROOT = '';
/**
* The installation path for owncloud on the server (e.g. /srv/http/owncloud)
*/
@@ -41,7 +37,7 @@ class OC{
/**
* the current request path relative to the owncloud root (e.g. files/index.php)
*/
- public static $SUBURI = '';
+ private static $SUBURI = '';
/**
* the owncloud root path for http requests (e.g. owncloud/)
*/
@@ -122,7 +118,7 @@ class OC{
public static function initPaths(){
// calculate the documentroot
- OC::$DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']);
+ $DOCUMENTROOT=realpath($_SERVER['DOCUMENT_ROOT']);
OC::$SERVERROOT=str_replace("\\",'/',substr(__FILE__,0,-13));
OC::$SUBURI=substr(realpath($_SERVER["SCRIPT_FILENAME"]),strlen(OC::$SERVERROOT));
$scriptName=$_SERVER["SCRIPT_NAME"];
@@ -138,7 +134,7 @@ 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(OC::$DOCUMENTROOT));
+// OC::$WEBROOT=substr(OC::$SERVERROOT,strlen($DOCUMENTROOT));
if(OC::$WEBROOT!='' and OC::$WEBROOT[0]!=='/'){
--
GitLab