summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2017-05-10 15:45:18 +0200
committerJoas Schilling <coding@schilljs.com>2017-05-10 15:45:18 +0200
commitcd2b567c21c7329640ff8b819261dec6ee819249 (patch)
treea4cbffccc68f420a745dc7ab9b472822163ebe82
parentf95f1b20f1048f59a5cbf670daaea03da8b05baa (diff)
downloadnextcloud-server-cd2b567c21c7329640ff8b819261dec6ee819249.tar.gz
nextcloud-server-cd2b567c21c7329640ff8b819261dec6ee819249.zip
Make sure we use the passed-in storage when there is one
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r--lib/private/Files/Storage/Wrapper/PermissionsMask.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/private/Files/Storage/Wrapper/PermissionsMask.php b/lib/private/Files/Storage/Wrapper/PermissionsMask.php
index d66390dad49..170929aa9fa 100644
--- a/lib/private/Files/Storage/Wrapper/PermissionsMask.php
+++ b/lib/private/Files/Storage/Wrapper/PermissionsMask.php
@@ -149,6 +149,9 @@ class PermissionsMask extends Wrapper {
}
public function getScanner($path = '', $storage = null) {
- return parent::getScanner($path, $this->storage);
+ if (!$storage) {
+ $storage = $this->storage;
+ }
+ return parent::getScanner($path, $storage);
}
}