diff options
| author | Joas Schilling <coding@schilljs.com> | 2017-03-15 15:23:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-15 15:23:17 +0100 |
| commit | f2d3704e972ed3f2e8e1f02c26ce4945274b6457 (patch) | |
| tree | ad845564a09656a65756b1cb64da781677acb86f /lib | |
| parent | 5ed45fc8e60bd9f63398d2bbe25bf63b26b2010e (diff) | |
| parent | 8f92808cafcad902651b0ecc86ff89fddbe6a251 (diff) | |
| download | nextcloud-server-f2d3704e972ed3f2e8e1f02c26ce4945274b6457.tar.gz nextcloud-server-f2d3704e972ed3f2e8e1f02c26ce4945274b6457.zip | |
Merge pull request #3843 from nextcloud/encryption-fix-mail-share
take share by mail into consideration if we calculate the access list
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Share/Share.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php index da4b7dda91c..8aea6049de5 100644 --- a/lib/private/Share/Share.php +++ b/lib/private/Share/Share.php @@ -269,10 +269,10 @@ class Share extends Constants { $query = \OC_DB::prepare(' SELECT `share_with` FROM `*PREFIX*share` - WHERE `item_source` = ? AND `share_type` = ? AND `item_type` IN (\'file\', \'folder\')', 1 + WHERE `item_source` = ? AND `share_type` IN (?, ?) AND `item_type` IN (\'file\', \'folder\')', 1 ); - $result = $query->execute(array($source, self::SHARE_TYPE_LINK)); + $result = $query->execute(array($source, self::SHARE_TYPE_LINK, self::SHARE_TYPE_EMAIL)); if (\OCP\DB::isError($result)) { \OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage(), \OCP\Util::ERROR); @@ -2881,7 +2881,7 @@ class Share extends Constants { /** * @param IConfig $config - * @return bool + * @return bool */ public static function enforcePassword(IConfig $config) { $enforcePassword = $config->getAppValue('core', 'shareapi_enforce_links_password', 'no'); |