diff options
| author | Joas Schilling <coding@schilljs.com> | 2017-04-06 15:09:28 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-06 15:09:28 +0300 |
| commit | 02a47150dba4b7920ea80f8f7c9d9d494546b364 (patch) | |
| tree | be57ca8d0657265af4d7bcca4d8cba11f547522a | |
| parent | 562b93004693e289f29a678b560dae56ede68645 (diff) | |
| parent | d0b93ad404d093b03b0339cb95ae7ea970c37c20 (diff) | |
Merge pull request #4242 from nextcloud/encryption-fix-mail-share-stable11
[stable11] take share by mail into consideration if we calculate the access list
| -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 6abaa7dd413..1e318c3bc81 100644 --- a/lib/private/Share/Share.php +++ b/lib/private/Share/Share.php @@ -258,10 +258,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); @@ -2811,7 +2811,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'); |