Fix #1622: parameter for FosUser confirmation

2016-02-04 14:21:33 +01:00
parent e008c037f5
commit 3eb06f2891
5 changed files with 5 additions and 1 deletions
--- 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
--- 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
--- 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
--- 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
--- 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