diff --git a/main/cron/request_removal_reminder.php b/main/cron/request_removal_reminder.php index f6da1c3e7e..f47f297994 100644 --- a/main/cron/request_removal_reminder.php +++ b/main/cron/request_removal_reminder.php @@ -84,4 +84,3 @@ foreach ($urlList as $url) { } echo $message; } - diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php index 31d8c9e711..c55741e4b0 100755 --- a/main/inc/lib/usermanager.lib.php +++ b/main/inc/lib/usermanager.lib.php @@ -6284,6 +6284,33 @@ SQL; ]; } + /** + * @param int $userId + */ + public static function cleanUserRequestsOfRemoval($userId) + { + $userId = (int) $userId; + + $extraFieldValue = new ExtraFieldValue('user'); + $extraFieldsToDelete = [ + 'legal_accept', + 'request_for_legal_agreement_consent_removal', + 'request_for_legal_agreement_consent_removal_justification', + 'request_for_delete_account_justification', // just in case delete also this + 'request_for_delete_account', + ]; + + foreach ($extraFieldsToDelete as $variable) { + $value = $extraFieldValue->get_values_by_handler_and_field_variable( + $userId, + $variable + ); + if ($value && isset($value['id'])) { + $extraFieldValue->delete($value['id']); + } + } + } + /** * @return EncoderFactory */ @@ -6381,31 +6408,4 @@ SQL; return $url; } - - /** - * @param int $userId - */ - public static function cleanUserRequestsOfRemoval($userId) - { - $userId = (int) $userId; - - $extraFieldValue = new ExtraFieldValue('user'); - $extraFieldsToDelete = [ - 'legal_accept', - 'request_for_legal_agreement_consent_removal', - 'request_for_legal_agreement_consent_removal_justification', - 'request_for_delete_account_justification', // just in case delete also this - 'request_for_delete_account', - ]; - - foreach ($extraFieldsToDelete as $variable) { - $value = $extraFieldValue->get_values_by_handler_and_field_variable( - $userId, - $variable - ); - if ($value && isset($value['id'])) { - $extraFieldValue->delete($value['id']); - } - } - } }