зеркало из https://github.com/nextcloud/server.git
make sure we can load OC_Config when we need it
This commit is contained in:
Родитель
0e11cc9f6f
Коммит
109d806617
10
lib/base.php
10
lib/base.php
|
@ -139,6 +139,12 @@ class OC{
|
||||||
OC::$WEBROOT='/'.OC::$WEBROOT;
|
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
|
// search the 3rdparty folder
|
||||||
if(OC_Config::getValue('3rdpartyroot', '')<>'' and OC_Config::getValue('3rdpartyurl', '')<>''){
|
if(OC_Config::getValue('3rdpartyroot', '')<>'' and OC_Config::getValue('3rdpartyurl', '')<>''){
|
||||||
OC::$THIRDPARTYROOT=OC_Config::getValue('3rdpartyroot', '');
|
OC::$THIRDPARTYROOT=OC_Config::getValue('3rdpartyroot', '');
|
||||||
|
@ -227,6 +233,7 @@ class OC{
|
||||||
// register autoloader
|
// register autoloader
|
||||||
spl_autoload_register(array('OC','autoload'));
|
spl_autoload_register(array('OC','autoload'));
|
||||||
|
|
||||||
|
|
||||||
// set some stuff
|
// set some stuff
|
||||||
//ob_start();
|
//ob_start();
|
||||||
error_reporting(E_ALL | E_STRICT);
|
error_reporting(E_ALL | E_STRICT);
|
||||||
|
@ -253,13 +260,14 @@ class OC{
|
||||||
$_SERVER['PHP_AUTH_PW'] = strip_tags($password);
|
$_SERVER['PHP_AUTH_PW'] = strip_tags($password);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
self::initPaths();
|
||||||
|
|
||||||
// register the stream wrappers
|
// register the stream wrappers
|
||||||
require_once('streamwrappers.php');
|
require_once('streamwrappers.php');
|
||||||
stream_wrapper_register("fakedir", "OC_FakeDirStream");
|
stream_wrapper_register("fakedir", "OC_FakeDirStream");
|
||||||
stream_wrapper_register('static', 'OC_StaticStreamWrapper');
|
stream_wrapper_register('static', 'OC_StaticStreamWrapper');
|
||||||
stream_wrapper_register('close', 'OC_CloseStreamWrapper');
|
stream_wrapper_register('close', 'OC_CloseStreamWrapper');
|
||||||
|
|
||||||
self::initPaths();
|
|
||||||
self::checkInstalled();
|
self::checkInstalled();
|
||||||
self::checkSSL();
|
self::checkSSL();
|
||||||
self::checkUpgrade();
|
self::checkUpgrade();
|
||||||
|
|
Загрузка…
Ссылка в новой задаче