Merge branch '2.0'

ezpublishlegacy · Jan 26, 2018 · 4d56b12 · 4d56b12
2 parents 01c7611 + 093cb49
commit 4d56b12
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "ezsystems/repository-forms",
     "description": "Use Symfony forms with eZ Platform repository objects",
-    "license": "GPL-2.0",
+    "license": "GPL-2.0-only",
     "type": "ezplatform-bundle",
     "authors": [
         {

diff --git a/lib/Data/Mapper/UserRegisterMapper.php b/lib/Data/Mapper/UserRegisterMapper.php
@@ -59,6 +59,7 @@ public function mapToFormData()
         $data = new UserRegisterData([
             'contentType' => $contentType,
             'mainLanguageCode' => $this->params['language'],
+            'enabled' => true,
         ]);
         $data->addParentGroup($this->parentGroupLoader->loadGroup());
 

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 = $userAccountFieldData->enabled;
+            $data->enabled = $data->enabled ?? $userAccountFieldData->enabled;
 
             /** @var Value $userValue */
             $userValue = clone $data->contentType