From: Nicolas Lœuillet <nicolas.loeuillet@smile.fr>
Date: Thu, 4 Feb 2016 13:21:33 +0000 (+0100)
Subject: Fix #1622: parameter for FosUser confirmation
X-Git-Tag: 2.0.0-beta.1~56^2~1
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=3eb06f2891f4bd990751442d36f4e9cd6c025502;p=github%2Fwallabag%2Fwallabag.git

Fix #1622: parameter for FosUser confirmation
---

diff --git a/app/config/config.yml b/app/config/config.yml
index dc6bccee..7dac4d3b 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -168,7 +168,7 @@ fos_user:
     user_class: Wallabag\UserBundle\Entity\User
     registration:
         confirmation:
-            enabled: true
+            enabled: %fosuser_confirmation%
     from_email:
         address:        %from_email%
         sender_name:    wallabag
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 79654e9e..bf3fd5f5 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -40,5 +40,6 @@ parameters:
     # two factor stuff
     twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
+    fosuser_confirmation: true
 
     from_email: no-reply@wallabag.org
diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql
index dceb5dea..bc6c7844 100644
--- a/app/config/tests/parameters.yml.dist.mysql
+++ b/app/config/tests/parameters.yml.dist.mysql
@@ -30,5 +30,6 @@ parameters:
     # two factor stuff
     twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
+    fosuser_confirmation: true
 
     from_email: no-reply@wallabag.org
diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql
index e07db610..2520fec0 100644
--- a/app/config/tests/parameters.yml.dist.pgsql
+++ b/app/config/tests/parameters.yml.dist.pgsql
@@ -30,5 +30,6 @@ parameters:
     # two factor stuff
     twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
+    fosuser_confirmation: true
 
     from_email: no-reply@wallabag.org
diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite
index 01589d28..253da5b7 100644
--- a/app/config/tests/parameters.yml.dist.sqlite
+++ b/app/config/tests/parameters.yml.dist.sqlite
@@ -30,5 +30,6 @@ parameters:
     # two factor stuff
     twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
+    fosuser_confirmation: true
 
     from_email: no-reply@wallabag.org