changeset 311:6ab8c171e491

do not check new user's email address against disabled accounts imported from: moin--main--1.5--patch-315
author Thomas Waldmann <tw@waldmann-edv.de>
date Tue, 13 Dec 2005 12:47:35 +0000
parents aca556896e2e
children 40d31045feb4
files MoinMoin/userform.py docs/CHANGES
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/userform.py	Tue Dec 13 12:34:25 2005 +0000
+++ b/MoinMoin/userform.py	Tue Dec 13 12:47:35 2005 +0000
@@ -145,7 +145,7 @@
                     if uid == theuser.id:
                         continue
                     thisuser = user.User(self.request, uid)
-                    if thisuser.email == theuser.email:
+                    if thisuser.email == theuser.email and not thisuser.disabled:
                         return _("This email already belongs to somebody else.")
 
             # save data
--- a/docs/CHANGES	Tue Dec 13 12:34:25 2005 +0000
+++ b/docs/CHANGES	Tue Dec 13 12:47:35 2005 +0000
@@ -12,6 +12,8 @@
       Thanks to Matthew Gilbert.
     * Fixed modern theme rendering, including some fixes and workarounds for
       broken MS IE.
+    * When checking for email uniqueness, do not compare with disabled user
+      profiles.
 
   Other changes:
     * Made it easier for auth methods needing a user interface (like ldap or