mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pass \OC::$WEBROOT to the ctr

This commit is contained in:
Lukas Reschke 2014-11-27 14:50:14 +01: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
View File

@ -466,7 +466,7 @@ class OC {
} }
// setup the basic server // 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()->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd);
\OC::$server->getEventLogger()->start('boot', 'Initialize'); \OC::$server->getEventLogger()->start('boot', 'Initialize');

15
lib/private/server.php
View File

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