From cd2b567c21c7329640ff8b819261dec6ee819249 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 10 May 2017 15:45:18 +0200
Subject: [PATCH] Make sure we use the passed-in storage when there is one

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/private/Files/Storage/Wrapper/PermissionsMask.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/private/Files/Storage/Wrapper/PermissionsMask.php b/lib/private/Files/Storage/Wrapper/PermissionsMask.php
index d66390dad4..170929aa9f 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);
 	}
 }