summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2020-10-20 10:20:26 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2020-10-20 10:20:26 +0200
commit620be7dc221ad3eac5f93216a92275c3f978e883 (patch)
tree3f30822ffa53426734da369ebfdf8b97211ee3e8
parent851e8c0ded27a6cf8d18f6cf42f2473a6fe2aa8c (diff)
downloadnextcloud-server-620be7dc221ad3eac5f93216a92275c3f978e883.tar.gz
nextcloud-server-620be7dc221ad3eac5f93216a92275c3f978e883.zip
Also expire share type email
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
-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')),