diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2020-10-20 11:33:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-20 11:33:17 +0200 |
| commit | 547c9dbd51698d29afd3a6f79a393877f5bf28e5 (patch) | |
| tree | 3f30822ffa53426734da369ebfdf8b97211ee3e8 | |
| parent | 851e8c0ded27a6cf8d18f6cf42f2473a6fe2aa8c (diff) | |
| parent | 620be7dc221ad3eac5f93216a92275c3f978e883 (diff) | |
| download | nextcloud-server-547c9dbd51698d29afd3a6f79a393877f5bf28e5.tar.gz nextcloud-server-547c9dbd51698d29afd3a6f79a393877f5bf28e5.zip | |
Merge pull request #23580 from nextcloud/feat/share-mail-expire
Also expire share type email
| -rw-r--r-- | apps/files_sharing/lib/ExpireSharesJob.php | 5 |
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')), |