X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FExpireAndRemoveUsers.php;h=f28f410b965e24af141810281ec9f879f622fe99;hb=bf8fb215a9cc554b5ec5b774168a52fb56fa43e6;hp=c8344b6fd956cba4b5d3f11b8d7f71333112ce95;hpb=2e5b4dedb85f3d417bfdf360d9d40ca12648fbe6;p=friendica.git

diff --git a/src/Worker/ExpireAndRemoveUsers.php b/src/Worker/ExpireAndRemoveUsers.php
index c8344b6fd9..f28f410b96 100644
--- a/src/Worker/ExpireAndRemoveUsers.php
+++ b/src/Worker/ExpireAndRemoveUsers.php
@@ -33,9 +33,14 @@ class ExpireAndRemoveUsers
 	public static function execute()
 	{
 		// expire any expired regular accounts. Don't expire forums.
-		$condition = ["NOT `account_expired` AND `account_expires_on` > ? AND `account_expires_on` < UTC_TIMESTAMP() AND `page-flags` = 0", DBA::NULL_DATETIME];
+		$condition = ["NOT `account_expired` AND `account_expires_on` > ? AND `account_expires_on` < UTC_TIMESTAMP() AND `page-flags` = ? AND `uid` != ?",
+			DBA::NULL_DATETIME, User::PAGE_FLAGS_NORMAL, 0];
 		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,
+			'account_expires_on' => DBA::NULL_DATETIME], ['uid' => 0]);
+
 		// Remove any freshly expired account
 		$users = DBA::select('user', ['uid'], ['account_expired' => true, 'account_removed' => false]);
 		while ($user = DBA::fetch($users)) {