Merge pull request from GHSA-wwvf-8p58-hh38

* EZP-32165: Fix for newly created users being always enabled * EZP-32165: Applied review remark * EZP-32165: CS * EZP-32165: Fixed UserFieldsSubscriber instead
ezsystems · Jun 25, 2021 · f9ccc3f · f9ccc3f
1 parent 56b8070
commit f9ccc3f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/lib/Data/Mapper/UserCreateMapper.php b/lib/Data/Mapper/UserCreateMapper.php
@@ -27,11 +27,7 @@
 class UserCreateMapper
 {
     /**
-     * @param ContentType $contentType
      * @param UserGroup[] $parentGroups
-     * @param array $params
-     *
-     * @return UserCreateData
      *
      * @throws UndefinedOptionsException
      * @throws OptionDefinitionException
@@ -64,8 +60,6 @@ public function mapToFormData(ContentType $contentType, array $parentGroups, arr
     }
 
     /**
-     * @param OptionsResolver $optionsResolver
-     *
      * @throws AccessException
      */
     private function configureOptions(OptionsResolver $optionsResolver): void

diff --git a/lib/Form/EventSubscriber/UserFieldsSubscriber.php b/lib/Form/EventSubscriber/UserFieldsSubscriber.php
@@ -62,7 +62,7 @@ private function handleUserCreateData(UserCreateData $data)
             $data->login = $userAccountFieldData->username;
             $data->email = $userAccountFieldData->email;
             $data->password = $userAccountFieldData->password;
-            $data->enabled = $data->enabled ?? $userAccountFieldData->enabled;
+            $data->enabled = $userAccountFieldData->enabled ?? $data->enabled;
 
             /** @var Value $userValue */
             $userValue = clone $data->contentType