From 03f27b4c2c2c3a6d3187a877cf5feb93830b7a9f Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 13 Jul 2017 14:17:52 +0200 Subject: Fix scan permissions with nested permissions masks Signed-off-by: Robin Appelman --- lib/private/Files/Storage/Wrapper/PermissionsMask.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/private/Files/Storage/Wrapper/PermissionsMask.php') diff --git a/lib/private/Files/Storage/Wrapper/PermissionsMask.php b/lib/private/Files/Storage/Wrapper/PermissionsMask.php index 1bda92f13aa..16f0e420818 100644 --- a/lib/private/Files/Storage/Wrapper/PermissionsMask.php +++ b/lib/private/Files/Storage/Wrapper/PermissionsMask.php @@ -143,7 +143,7 @@ class PermissionsMask extends Wrapper { $data = parent::getMetaData($path); if ($data && isset($data['permissions'])) { - $data['scan_permissions'] = $data['permissions']; + $data['scan_permissions'] = isset($data['scan_permissions']) ? $data['scan_permissions'] : $data['permissions']; $data['permissions'] &= $this->mask; } return $data; -- cgit v1.2.3