Merge pull request #1080 from nextcloud/always_lazyroot

Always use the LazyRoot
This commit is contained in:
Lukas Reschke 2016-08-26 13:18:01 +02:00 committed by GitHub
commit de6ab82766
2 changed files with 3 additions and 3 deletions

View File

@ -139,7 +139,7 @@ class LazyRoot implements IRootFolder {
* @inheritDoc * @inheritDoc
*/ */
public function get($path) { public function get($path) {
$this->__call(__FUNCTION__, func_get_args()); return $this->__call(__FUNCTION__, func_get_args());
} }
/** /**

View File

@ -185,7 +185,7 @@ class Server extends ServerContainer implements IServerContainer {
}); });
$this->registerService('LazyRootFolder', function(Server $c) { $this->registerService('LazyRootFolder', function(Server $c) {
return new LazyRoot(function() use ($c) { return new LazyRoot(function() use ($c) {
return $c->getRootFolder(); return $c->query('RootFolder');
}); });
}); });
$this->registerService('UserManager', function (Server $c) { $this->registerService('UserManager', function (Server $c) {
@ -839,7 +839,7 @@ class Server extends ServerContainer implements IServerContainer {
* @return \OCP\Files\IRootFolder * @return \OCP\Files\IRootFolder
*/ */
public function getRootFolder() { public function getRootFolder() {
return $this->query('RootFolder'); return $this->query('LazyRootFolder');
} }
/** /**