]> source.dussan.org Git - nextcloud-server.git/commitdiff
also set nonmaskedstorage in error cases
authorRobin Appelman <robin@icewind.nl>
Mon, 20 Mar 2017 17:02:21 +0000 (18:02 +0100)
committerLukas Reschke <lukas@statuscode.ch>
Mon, 22 May 2017 21:16:21 +0000 (23:16 +0200)
Signed-off-by: Robin Appelman <robin@icewind.nl>
apps/files_sharing/lib/SharedStorage.php

index 560c195d8baa5e3464abc180ff19a3248fa6716e..77bbb2f227b2dc129d34719363a09238ad3a1e82 100644 (file)
@@ -98,6 +98,7 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto
        private function getSourceRootInfo() {
                if (is_null($this->sourceRootInfo)) {
                        if (is_null($this->superShare->getNodeCacheEntry())) {
+                               $this->init();
                                $this->sourceRootInfo = $this->nonMaskedStorage->getCache()->get($this->rootPath);
                        } else {
                                $this->sourceRootInfo = $this->superShare->getNodeCacheEntry();
@@ -132,6 +133,10 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto
                        $this->rootPath = '';
                        $this->logger->logException($e);
                }
+
+               if (!$this->nonMaskedStorage) {
+                       $this->nonMaskedStorage = $this->storage;
+               }
        }
 
        /**