diff options
author | Roeland Jago Douma <roeland@famdouma.nl> | 2016-08-26 12:13:34 +0200 |
---|---|---|
committer | Roeland Jago Douma <roeland@famdouma.nl> | 2016-08-26 12:13:34 +0200 |
commit | f805aff67c0b9bb70fe7f2c2e65e57546725a51b (patch) | |
tree | 914e4a6e2d592e8d3ae7ffff88d39924c866a293 /lib | |
parent | ad4cab130eda568cdd1e5344796140d853655740 (diff) | |
download | nextcloud-server-f805aff67c0b9bb70fe7f2c2e65e57546725a51b.tar.gz nextcloud-server-f805aff67c0b9bb70fe7f2c2e65e57546725a51b.zip |
Always use the LazyRoot
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/Files/Node/LazyRoot.php | 2 | ||||
-rw-r--r-- | lib/private/Server.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/Files/Node/LazyRoot.php b/lib/private/Files/Node/LazyRoot.php index 317b8144653..1fb3f6448bc 100644 --- a/lib/private/Files/Node/LazyRoot.php +++ b/lib/private/Files/Node/LazyRoot.php @@ -139,7 +139,7 @@ class LazyRoot implements IRootFolder { * @inheritDoc */ public function get($path) { - $this->__call(__FUNCTION__, func_get_args()); + return $this->__call(__FUNCTION__, func_get_args()); } /** diff --git a/lib/private/Server.php b/lib/private/Server.php index b651285e9a5..6f2b5b69bc8 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -185,7 +185,7 @@ class Server extends ServerContainer implements IServerContainer { }); $this->registerService('LazyRootFolder', function(Server $c) { return new LazyRoot(function() use ($c) { - return $c->getRootFolder(); + return $c->query('RootFolder'); }); }); $this->registerService('UserManager', function (Server $c) { @@ -838,7 +838,7 @@ class Server extends ServerContainer implements IServerContainer { * @return \OCP\Files\IRootFolder */ public function getRootFolder() { - return $this->query('RootFolder'); + return $this->query('LazyRootFolder'); } /** |