From: Robin Appelman Date: Mon, 20 Mar 2017 17:02:21 +0000 (+0100) Subject: also set nonmaskedstorage in error cases X-Git-Tag: v11.0.4RC1~68^2~2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4652923011ee30ea28b94ab4bda202964b01040f;p=nextcloud-server.git also set nonmaskedstorage in error cases Signed-off-by: Robin Appelman --- diff --git a/apps/files_sharing/lib/SharedStorage.php b/apps/files_sharing/lib/SharedStorage.php index 560c195d8ba..77bbb2f227b 100644 --- a/apps/files_sharing/lib/SharedStorage.php +++ b/apps/files_sharing/lib/SharedStorage.php @@ -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; + } } /**