diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-03-23 18:52:41 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-03-23 18:55:26 +0100 |
| commit | 109d80661713b896287c0a58ddf1f55604ad1298 (patch) | |
| tree | 9244db8c6bb44a66d39cbc974de06518e4773e59 /lib/base.php | |
| parent | 0e11cc9f6ff6176ae723acd8facef9237252be5f (diff) | |
| download | nextcloud-server-109d80661713b896287c0a58ddf1f55604ad1298.tar.gz nextcloud-server-109d80661713b896287c0a58ddf1f55604ad1298.zip | |
make sure we can load OC_Config when we need it
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php index 54cc9f2c731..b07ac5af416 100644 --- a/lib/base.php +++ b/lib/base.php @@ -139,6 +139,12 @@ class OC{ OC::$WEBROOT='/'.OC::$WEBROOT; } + // ensure we can find OC_Config + set_include_path( + OC::$SERVERROOT.'/lib'.PATH_SEPARATOR. + get_include_path() + ); + // search the 3rdparty folder if(OC_Config::getValue('3rdpartyroot', '')<>'' and OC_Config::getValue('3rdpartyurl', '')<>''){ OC::$THIRDPARTYROOT=OC_Config::getValue('3rdpartyroot', ''); @@ -227,6 +233,7 @@ class OC{ // register autoloader spl_autoload_register(array('OC','autoload')); + // set some stuff //ob_start(); error_reporting(E_ALL | E_STRICT); @@ -252,6 +259,8 @@ class OC{ $_SERVER['PHP_AUTH_USER'] = strip_tags($name); $_SERVER['PHP_AUTH_PW'] = strip_tags($password); } + + self::initPaths(); // register the stream wrappers require_once('streamwrappers.php'); @@ -259,7 +268,6 @@ class OC{ stream_wrapper_register('static', 'OC_StaticStreamWrapper'); stream_wrapper_register('close', 'OC_CloseStreamWrapper'); - self::initPaths(); self::checkInstalled(); self::checkSSL(); self::checkUpgrade(); |