summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-02-29 08:31:10 +0100
committerMorris Jobke <hey@morrisjobke.de>2016-02-29 08:31:10 +0100
commit98e94de18f97e7f9b567497d684d994097211dd0 (patch)
tree85a58eb193808d8e0f3103d5c458d99aba2e6b4c
parentbbfc5bbf30a22c268ede1223707e5d50ae9cc4f1 (diff)
parent3285f5e585a1e8a863eb94507c4c45a12e5f48a9 (diff)
downloadnextcloud-server-98e94de18f97e7f9b567497d684d994097211dd0.tar.gz
nextcloud-server-98e94de18f97e7f9b567497d684d994097211dd0.zip
Merge pull request #22685 from owncloud/stable8.2-fix-thrashbin-cronjob
[Stable8.2] fix thrashbin cronjob
-rw-r--r--apps/files_trashbin/lib/backgroundjob/expiretrash.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/files_trashbin/lib/backgroundjob/expiretrash.php b/apps/files_trashbin/lib/backgroundjob/expiretrash.php
index 079fdd29912..285113a26e0 100644
--- a/apps/files_trashbin/lib/backgroundjob/expiretrash.php
+++ b/apps/files_trashbin/lib/backgroundjob/expiretrash.php
@@ -120,6 +120,12 @@ class ExpireTrash extends \OC\BackgroundJob\TimedJob {
return false;
}
+ //Check if this user has a trashbin directory
+ $view = new \OC\Files\View('/' . $user);
+ if (!$view->is_dir('/files_trashbin/files')){
+ return false;
+ }
+
\OC_Util::tearDownFS();
\OC_Util::setupFS($user);