From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 26 Jul 2008 18:02:36 +0000 (-0400)
Subject: allow account_creation_password to not be defined
X-Git-Tag: 2.60~210
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c2507d33cb684f62c29b8ec41a8a2aedf02a7302;p=ikiwiki.git

allow account_creation_password to not be defined
---

diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index a3fd2d4ed..e0e8e51df 100644
--- a/IkiWiki/Plugin/passwordauth.pm
+++ b/IkiWiki/Plugin/passwordauth.pm
@@ -105,7 +105,9 @@ sub formbuilder_setup (@) { #{{{
 		
 		if ($form->submitted eq "Register" || $form->submitted eq "Create Account") {
 			$form->field(name => "confirm_password", type => "password");
-			$form->field(name => "account_creation_password", type => "password") if (length $config{account_creation_password});
+			$form->field(name => "account_creation_password", type => "password")
+				 if (defined $config{account_creation_password} &&
+				     length $config{account_creation_password});
 			$form->field(name => "email", size => 50);
 			$form->title("register");
 			$form->text("");
@@ -142,7 +144,8 @@ sub formbuilder_setup (@) { #{{{
 						shift eq $config{account_creation_password};
 					},
 					required => 1,
-				) if (length $config{account_creation_password});
+				) if (defined $config{account_creation_password} &&
+				      length $config{account_creation_password});
 				$form->field(
 					name => "email",
 					validate => "EMAIL",