issue 590, user now gets verification email even on pending registrations, thanks Matt Doiron

This commit is contained in:
Massimo Di Pierro
2011-12-31 14:37:32 -06:00
parent 23223157d0
commit b5d979552f
2 changed files with 3 additions and 2 deletions
+1 -1
View File
@@ -1 +1 @@
Version 1.99.4 (2011-12-31 12:28:04) stable
Version 1.99.4 (2011-12-31 14:37:01) stable
+2 -1
View File
@@ -1909,7 +1909,8 @@ class Auth(object):
response.flash = self.messages.unable_send_email
return form
session.flash = self.messages.email_sent
if self.settings.registration_requires_approval:
if self.settings.registration_requires_approval and \
not self.settings.registration_requires_verification:
table_user[form.vars.id] = dict(registration_key='pending')
session.flash = self.messages.registration_pending
elif (not self.settings.registration_requires_verification or \