summaryrefslogtreecommitdiffstats
path: root/askbot/forms.py
diff options
context:
space:
mode:
Diffstat (limited to 'askbot/forms.py')
-rw-r--r--askbot/forms.py21
1 files changed, 10 insertions, 11 deletions
diff --git a/askbot/forms.py b/askbot/forms.py
index 39a390be..1ef8cefa 100644
--- a/askbot/forms.py
+++ b/askbot/forms.py
@@ -1449,21 +1449,20 @@ class EditUserForm(forms.Form):
"""For security reason one unique email in database"""
if self.user.email != self.cleaned_data['email']:
#todo dry it, there is a similar thing in openidauth
- if askbot_settings.EMAIL_UNIQUE is True:
- if 'email' in self.cleaned_data:
- try:
- User.objects.get(email=self.cleaned_data['email'])
- except User.DoesNotExist:
- return self.cleaned_data['email']
- except User.MultipleObjectsReturned:
- raise forms.ValidationError(_(
- 'this email has already been registered, '
- 'please use another one')
- )
+ if 'email' in self.cleaned_data:
+ try:
+ User.objects.get(email=self.cleaned_data['email'])
+ except User.DoesNotExist:
+ return self.cleaned_data['email']
+ except User.MultipleObjectsReturned:
raise forms.ValidationError(_(
'this email has already been registered, '
'please use another one')
)
+ raise forms.ValidationError(_(
+ 'this email has already been registered, '
+ 'please use another one')
+ )
return self.cleaned_data['email']