The query condition for active users are unified

2023-09-08 15:01:51 +00:00
parent 692a633dc8
commit 7e73283949
19 changed files with 33 additions and 37 deletions
--- a/src/Worker/ExpireAndRemoveUsers.php
+++ b/src/Worker/ExpireAndRemoveUsers.php
@@ -42,7 +42,7 @@ class ExpireAndRemoveUsers
 		DBA::update('user', ['account_expired' => true], $condition);

 		// Ensure to never remove the user with uid=0
-		DBA::update('user', ['account_expired' => false, 'account_removed' => false,
+		DBA::update('user', ['verified' => true, 'blocked' => false, 'account_removed' => false, 'account_expired' => false,
 			'account_expires_on' => DBA::NULL_DATETIME], ['uid' => 0]);

 		// Remove any freshly expired account