From d67f01e1d8dafc2fee792323ef42e552fbb1d85d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Oudot?= <clement@oodo.net>
Date: Wed, 20 Feb 2013 09:39:17 +0000
Subject: [PATCH] Do not force captcha parameters in the code (#217)

---
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm
index 93e9b260c..58fa13645 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm
@@ -647,11 +647,11 @@ sub setDefaultValues {
     $self->{mailOnPasswordChange}            ||= 0;
 
     # Captcha parameters
-    $self->{captcha_enabled} = 0;
-    $self->{captcha_size}    = 6;
-    $self->{captcha_output} =
+    $self->{captcha_enabled} = 0 unless defined $self->{captcha_enabled};
+    $self->{captcha_size}    = 6 unless defined $self->{captcha_size};
+    $self->{captcha_output} ||=
       '/usr/local/lemonldap-ng/htdocs/portal/captcha_output/';
-    $self->{captcha_data} = '/usr/local/lemonldap-ng/data/captcha/data/';
+    $self->{captcha_data} ||= '/usr/local/lemonldap-ng/data/captcha/data/';
 
     # Notification
     $self->{notificationWildcard} ||= "allusers";