From c0ac120578f04bd8758c162c09e045c633524e34 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 2 Jan 2021 09:11:38 +0000
Subject: [PATCH 1/3] Issue 9736: Fix for undroppable registrations

---
 src/Model/User.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Model/User.php b/src/Model/User.php
index 6960c5c2cf..dbace74e5d 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -1159,6 +1159,9 @@ class User
 			return false;
 		}
 
+		// Delete the avatar
+		Photo::delete(['uid' => $register['uid']]);
+
 		return DBA::delete('user', ['uid' => $register['uid']]) &&
 		       Register::deleteByHash($register['hash']);
 	}

From bbdb42358e3fe4c0b16b86cb40c70afad39bf740 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 2 Jan 2021 11:10:06 +0100
Subject: [PATCH 2/3] update the CREDITS.txt for the 2021.01 release

---
 CREDITS.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CREDITS.txt b/CREDITS.txt
index 07d6ecb2f3..2f68970548 100644
--- a/CREDITS.txt
+++ b/CREDITS.txt
@@ -35,6 +35,7 @@ Athalbert
 aweiher
 axelt
 balderino
+Balázs Úr
 Beanow
 beardyunixer
 Beatriz Vital
@@ -133,6 +134,7 @@ julia.domagalska
 Julio Cova
 Karel
 Karolina
+Kastal András
 Keenan Pepper
 Keith Fernie
 Klaus Weidenbach
@@ -144,11 +146,11 @@ Leberwurscht
 Leonard Lausen
 Lionel Triay
 loma-one
+loma1
 Lorem Ipsum
 Ludovic Grossard
 Lynn Stephenson
 maase2
-Magdalena Gazda
 Mai Anh Nguyen
 Manuel Pérez Monís
 Marcin Klessa
@@ -157,7 +159,6 @@ Marcus Müller
 Marie Olive
 Mariusz Pisz
 marmor
-Marquis_de_Carabas
 Martin Schmitt
 Mateusz Mikos
 Mats Sjöberg
@@ -177,6 +178,7 @@ mpanhans
 mytbk
 nathilia-peirce
 Nicola Spanti
+nobody
 Olaf Conradi
 Oliver
 Olivier
@@ -225,7 +227,6 @@ Samuli Valavuo
 Sandro Santilli
 Sebastian Egbers
 sella
-Sennewood
 Seth
 Silke Meyer
 Simon L'nu
@@ -242,7 +243,6 @@ Sveinn í Felli
 Sven Anders
 Sylke Vicious
 Sylvain Lagacé
-szymon.filip
 Sérgio Lima
 Taekus
 Tazman DeVille

From 10b035b51ad8f0d1e418dd372b86004e638894ba Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 2 Jan 2021 19:33:50 +0000
Subject: [PATCH 3/3] Additional worker cooldown

---
 src/Core/Worker.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 2f39a82fe5..1759fae19e 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -411,6 +411,12 @@ class Worker
 	{
 		$a = DI::app();
 
+		$cooldown = DI::config()->get("system", "worker_cooldown", 0);
+		if ($cooldown > 0) {
+			Logger::info('Pre execution cooldown.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'cooldown' => $cooldown]);
+			sleep($cooldown);
+		}
+
 		Logger::enableWorker($funcname);
 
 		Logger::info("Process start.", ['priority' => $queue["priority"], 'id' => $queue["id"]]);
@@ -483,10 +489,8 @@ class Worker
 
 		DI::profiler()->saveLog(DI::logger(), "ID " . $queue["id"] . ": " . $funcname);
 
-		$cooldown = DI::config()->get("system", "worker_cooldown", 0);
-
 		if ($cooldown > 0) {
-			Logger::info('Cooldown.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'cooldown' => $cooldown]);
+			Logger::info('Post execution cooldown.', ['priority' => $queue["priority"], 'id' => $queue["id"], 'cooldown' => $cooldown]);
 			sleep($cooldown);
 		}
 	}