Always use the LazyRoot

diff --git a/lib/private/Files/Node/LazyRoot.php b/lib/private/Files/Node/LazyRoot.php
index 317b8144653a88530d549db96c2539a9e4786a53..1fb3f6448bcb2665e6b465b56cb6ce1c23f47f24 100644 (file)
--- 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 b651285e9a5ee940f70c89d5548dce28749890cf..6f2b5b69bc8226177ce0d81453595d32a0c10124 100644 (file)
--- 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');
        }
 
        /**