From 8f92808cafcad902651b0ecc86ff89fddbe6a251 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Tue, 14 Mar 2017 17:40:42 +0100 Subject: take share by mail into consideration if we calculate the access list Signed-off-by: Bjoern Schiessle --- lib/private/Share/Share.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/private/Share/Share.php') 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'); -- cgit v1.2.3