diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2016-08-26 13:18:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-26 13:18:01 +0200 |
| commit | de6ab82766c929726071e736c1b9c731f2121222 (patch) | |
| tree | fbdc95cedb7d859dffd322f8b5e8b2937b2eba8f | |
| parent | 044d7c3bb71b24a140bdf6581779a16474b0e490 (diff) | |
| parent | f805aff67c0b9bb70fe7f2c2e65e57546725a51b (diff) | |
| download | nextcloud-server-de6ab82766c929726071e736c1b9c731f2121222.tar.gz nextcloud-server-de6ab82766c929726071e736c1b9c731f2121222.zip | |
Merge pull request #1080 from nextcloud/always_lazyroot
Always use the LazyRoot
| -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 dd16b3173a6..088908b5f96 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) { @@ -839,7 +839,7 @@ class Server extends ServerContainer implements IServerContainer { * @return \OCP\Files\IRootFolder */ public function getRootFolder() { - return $this->query('RootFolder'); + return $this->query('LazyRootFolder'); } /** |