[BUGFIX] Persist disabled unsetting on user confirmation

in2code-de · Nov 4, 2024 · e823a43 · e823a43
1 parent 33feeae
commit e823a43
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Classes/Controller/NewController.php b/Classes/Controller/NewController.php
@@ -213,14 +213,18 @@ protected function statusUserConfirmation(User $user, string $hash, string $stat
                 ConfigurationUtility::getValue('new./forceValues./onUserConfirmation.', $this->config)
             );
             $user->setTxFemanagerConfirmedbyuser(true);
+
+            if (!$this->isAdminConfirmationMissing($user)) {
+                $user->setDisable(false);
+            }
+
             $this->userRepository->update($user);
             $this->persistenceManager->persistAll();
             $this->logUtility->log(Log::STATUS_REGISTRATIONCONFIRMEDUSER, $user);
 
             if ($this->isAdminConfirmationMissing($user)) {
                 $this->createAdminConfirmationRequest($user);
             } else {
-                $user->setDisable(false);
                 $this->logUtility->log(Log::STATUS_NEWREGISTRATION, $user);
                 $this->finalCreate($user, 'new', 'createStatus', true, $status);
             }