Merge pull request #22628 from owncloud/fix-thrashbin-cronjob

Skip users with no trashbin
2016-02-25 16:55:36 +01:00 · 2016-02-25 16:55:36 +01:00 · 29e3c4a60e
commit 29e3c4a60e
parent 35423102af aac6932e92
1 changed files with 6 additions and 0 deletions
--- 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);