Fix #1622: parameter for FosUser confirmation

diff --git a/app/config/config.yml b/app/config/config.yml
index dc6bccee00a768461d977b4e7e675d848a5032e7..7dac4d3bb8bb1581f0bf9d1498a4413893ec4514 100644 (file)
--- 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 79654e9e8bb95d3b876b27471268a59809f2bb7b..bf3fd5f5b1ac78e5b869a23f3339abb611bc4e03 100644 (file)
--- 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 dceb5dea0ec77e38a003a9934fdd66b02030b1e2..bc6c784415fe7e5a23d9aac03eb74320d54814a7 100644 (file)
--- 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 e07db6108bc1e5dd74595077dd039f0ef1399fdf..2520fec0414c3ad34599f7cd14e366f401ebae96 100644 (file)
--- 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 01589d2821e74fe0bd4e67fc99cb01067d2d05ce..253da5b77f03360a3c5ac4e65507bb59a01c5b5f 100644 (file)
--- 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