diff options
| author | Robin Appelman <robin@icewind.nl> | 2017-07-13 14:17:52 +0200 |
|---|---|---|
| committer | Robin Appelman <robin@icewind.nl> | 2017-07-13 14:29:04 +0200 |
| commit | 03f27b4c2c2c3a6d3187a877cf5feb93830b7a9f (patch) | |
| tree | fe78c15253a6ccd3ec84416b6e50f93583fc241a /lib/private/Files/Storage/Wrapper/PermissionsMask.php | |
| parent | f71457782b1c0e6aa66ba6b2aac126aa5a2bc9dc (diff) | |
| download | nextcloud-server-03f27b4c2c2c3a6d3187a877cf5feb93830b7a9f.tar.gz nextcloud-server-03f27b4c2c2c3a6d3187a877cf5feb93830b7a9f.zip | |
Fix scan permissions with nested permissions masks
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib/private/Files/Storage/Wrapper/PermissionsMask.php')
| -rw-r--r-- | lib/private/Files/Storage/Wrapper/PermissionsMask.php | 2 |
1 files changed, 1 insertions, 1 deletions
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; |