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

Merge pull request #808 from nextcloud/skip_expiry_for_users_that_never_logged_in 

Skip version and trash expiry for users that never logged in
This commit is contained in:
Lukas Reschke 2016-08-10 16:31:11 +02:00 committed by GitHub
parent 7249f1340f d59cb04427
commit 8831d1f53b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php
View File

@ -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');

2
apps/files_versions/lib/BackgroundJob/ExpireVersions.php
View File

@ -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);