From: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Date: Tue, 20 Oct 2020 08:20:26 +0000 (+0200)
Subject: Also expire share type email
X-Git-Tag: v20.0.2RC1~77^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2aa69ba895ca98f389d33d9b1c4c55ed19a8a74e;p=nextcloud-server.git

Also expire share type email

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---

diff --git a/apps/files_sharing/lib/ExpireSharesJob.php b/apps/files_sharing/lib/ExpireSharesJob.php
index d56e1f02425..5e48dd9ffd7 100644
--- a/apps/files_sharing/lib/ExpireSharesJob.php
+++ b/apps/files_sharing/lib/ExpireSharesJob.php
@@ -60,7 +60,10 @@ class ExpireSharesJob extends TimedJob {
 			->from('share')
 			->where(
 				$qb->expr()->andX(
-					$qb->expr()->eq('share_type', $qb->expr()->literal(IShare::TYPE_LINK)),
+					$qb->expr()->orX(
+						$qb->expr()->eq('share_type', $qb->expr()->literal(IShare::TYPE_LINK)),
+						$qb->expr()->eq('share_type', $qb->expr()->literal(IShare::TYPE_EMAIL))
+					),
 					$qb->expr()->lte('expiration', $qb->expr()->literal($now)),
 					$qb->expr()->orX(
 						$qb->expr()->eq('item_type', $qb->expr()->literal('file')),