sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pass \OC::$WEBROOT to the ctr

remotes/origin/fix-10825
Lukas Reschke 2014-11-27 14:50:14 +07:00
parent fef32e63dd
commit e35feadac2
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/base.php
Unescape Escape View File

@ -466,7 +466,7 @@ class OC {
}
// setup the basic server
self::$server = new \OC\Server();
self::$server = new \OC\Server(\OC::$WEBROOT);
\OC::$server->getEventLogger()->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd);
\OC::$server->getEventLogger()->start('boot', 'Initialize');

15
lib/private/server.php
Unescape Escape View File

@ -29,7 +29,15 @@ use OC\Tagging\TagMapper;
* TODO: hookup all manager classes
*/
class Server extends SimpleContainer implements IServerContainer {
function __construct() {
/** @var string */
private $webRoot;
/**
* @param string $webRoot
*/
function __construct($webRoot) {
$this->webRoot = $webRoot;
$this->registerService('ContactsManager', function ($c) {
return new ContactsManager();
});
@ -233,8 +241,7 @@ class Server extends SimpleContainer implements IServerContainer {
return new NullQueryLogger();
}
});
$this->registerService('TempManager', function ($c) {
/** @var Server $c */
$this->registerService('TempManager', function (Server $c) {
return new TempManager(get_temp_dir(), $c->getLogger());
});
$this->registerService('AppManager', function(Server $c) {
@ -638,6 +645,6 @@ class Server extends SimpleContainer implements IServerContainer {
* @return string
*/
function getWebRoot() {
return \OC::$WEBROOT;
return $this->webRoot;
}
}