]> source.dussan.org Git - nextcloud-server.git/commitdiff
Also expire share type email 23583/head
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Tue, 20 Oct 2020 08:20:26 +0000 (10:20 +0200)
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>
Tue, 20 Oct 2020 09:35:45 +0000 (09:35 +0000)
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
apps/files_sharing/lib/ExpireSharesJob.php

index d56e1f02425f7edd37adbfbd12ae418114a56035..5e48dd9ffd7acbd31f036fe09eba97b03d7785f0 100644 (file)
@@ -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')),