Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2020-10-20 11:20:26 +0300
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>2020-10-20 12:35:45 +0300
commit2aa69ba895ca98f389d33d9b1c4c55ed19a8a74e (patch)
tree9dd14ecf1a35d3d9c160c9e795cad319849751a8 /apps/files_sharing/lib
parent2005119af2132444cb5561b77bba9b65193f7835 (diff)
Also expire share type email
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'apps/files_sharing/lib')
-rw-r--r--apps/files_sharing/lib/ExpireSharesJob.php5
1 files changed, 4 insertions, 1 deletions
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')),