mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23583 from nextcloud/backport/23580/stable20 

[stable20] Also expire share type email
This commit is contained in:
Roeland Jago Douma 2020-10-24 10:54:41 +02:00 committed by GitHub
parent 2d3a2e20ae 2aa69ba895
commit 5a7a0a2f64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/files_sharing/lib/ExpireSharesJob.php
View File

@ -60,7 +60,10 @@ class ExpireSharesJob extends TimedJob {
->from('share') ->from('share')
->where( ->where(
$qb->expr()->andX( $qb->expr()->andX(
$qb->expr()->orX(
$qb->expr()->eq('share_type', $qb->expr()->literal(IShare::TYPE_LINK)), $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()->lte('expiration', $qb->expr()->literal($now)),
$qb->expr()->orX( $qb->expr()->orX(
$qb->expr()->eq('item_type', $qb->expr()->literal('file')), $qb->expr()->eq('item_type', $qb->expr()->literal('file')),