Merge branch 'release/v13.96' into master
This commit is contained in:
@@ -3724,8 +3724,8 @@ class UserForm(ModelForm):
|
|||||||
'Please enter a valid email address')
|
'Please enter a valid email address')
|
||||||
|
|
||||||
try:
|
try:
|
||||||
match = User.objects.filter(email__iexact=email)
|
match = User.objects.filter(email__iexact=email).exclude(id=self.instance.id)
|
||||||
if self.instance in match:
|
if match.count() == 0:
|
||||||
return email
|
return email
|
||||||
except User.DoesNotExist:
|
except User.DoesNotExist:
|
||||||
return email
|
return email
|
||||||
|
|||||||
Reference in New Issue
Block a user