Skip version and trash expiry for users that never logged in

diff --git a/apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php b/apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php
index f2c16843b7004b93cce42d6158a736b55331737d..7d481afeb59d75a1337b78b0929a2adf4617b57d 100644 (file)
--- a/apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php
+++ b/apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php
@@ -79,7 +79,7 @@ class ExpireTrash extends \OC\BackgroundJob\TimedJob {
 
                $this->userManager->callForAllUsers(function(IUser $user) {
                        $uid = $user->getUID();
-                       if (!$this->setupFS($uid)) {
+                       if ($user->getLastLogin() === 0 || !$this->setupFS($uid)) {
                                return;
                        }
                        $dirContent = Helper::getTrashFiles('/', $uid, 'mtime');

diff --git a/apps/files_versions/lib/BackgroundJob/ExpireVersions.php b/apps/files_versions/lib/BackgroundJob/ExpireVersions.php
index a5d3efda77b269b1076c41ca29c20b80aaabb69f..8e1f02cdfbf0c0a6ec3e42438949cb35b0163d70 100644 (file)
--- a/apps/files_versions/lib/BackgroundJob/ExpireVersions.php
+++ b/apps/files_versions/lib/BackgroundJob/ExpireVersions.php
@@ -69,7 +69,7 @@ class ExpireVersions extends \OC\BackgroundJob\TimedJob {
 
                $this->userManager->callForAllUsers(function(IUser $user) {
                        $uid = $user->getUID();
-                       if (!$this->setupFS($uid)) {
+                       if ($user->getLastLogin() === 0 || !$this->setupFS($uid)) {
                                return;
                        }
                        Storage::expireOlderThanMaxForUser($uid);