diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-07-13 23:27:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-13 23:27:01 +0200 |
| commit | 1f1504e071d38dffd274cd9b4123d2093a6beb3e (patch) | |
| tree | eb276d206866df66cf50183108b2a78a535bc039 /lib | |
| parent | 01466ab8403c9f1fb1f2a92490bbf1be82db0a43 (diff) | |
| parent | 03f27b4c2c2c3a6d3187a877cf5feb93830b7a9f (diff) | |
| download | nextcloud-server-1f1504e071d38dffd274cd9b4123d2093a6beb3e.tar.gz nextcloud-server-1f1504e071d38dffd274cd9b4123d2093a6beb3e.zip | |
Merge pull request #5708 from nextcloud/nested-permissions-mask
Fix scan permissions with nested permissions masks
Diffstat (limited to 'lib')
| -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; |