diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2014-07-29 14:05:13 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2014-07-29 14:05:13 +0200 |
| commit | a36c4402f5f531aff8ee952742c1dc2f678d75bc (patch) | |
| tree | b79357091802da3812ea5536bf0400e00589c256 /lib | |
| parent | 03f7c5c56161c68ecc52a5e15d6f4d41a13fbef1 (diff) | |
| parent | 67e302885cab639c70d3dca5c022d6fa9648956c (diff) | |
| download | nextcloud-server-a36c4402f5f531aff8ee952742c1dc2f678d75bc.tar.gz nextcloud-server-a36c4402f5f531aff8ee952742c1dc2f678d75bc.zip | |
Merge pull request #9988 from owncloud/sharing_remove_share_permission
remove share permission if user is excluded from sharing
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/share/share.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/share/share.php b/lib/private/share/share.php index af286e7154e..0c42853302d 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -1397,7 +1397,7 @@ class Share extends \OC\Share\Constants { } } // Check if resharing is allowed, if not remove share permission - if (isset($row['permissions']) && !self::isResharingAllowed()) { + if (isset($row['permissions']) && (!self::isResharingAllowed() | \OC_Util::isSharingDisabledForUser())) { $row['permissions'] &= ~\OCP\PERMISSION_SHARE; } // Add display names to result |