Merge pull request #3843 from nextcloud/encryption-fix-mail-share
take share by mail into consideration if we calculate the access list
This commit is contained in:
commit
f2d3704e97
|
@ -269,10 +269,10 @@ class Share extends Constants {
|
||||||
$query = \OC_DB::prepare('
|
$query = \OC_DB::prepare('
|
||||||
SELECT `share_with`
|
SELECT `share_with`
|
||||||
FROM `*PREFIX*share`
|
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)) {
|
if (\OCP\DB::isError($result)) {
|
||||||
\OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage(), \OCP\Util::ERROR);
|
\OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage(), \OCP\Util::ERROR);
|
||||||
|
|
Loading…
Reference in New Issue