[CMF-checkins] CVS: CMF/CMFDefault - RegistrationTool.py:1.13.4.2

[Tres Seaver]

Update of /cvs-repository/CMF/CMFDefault
In directory cvs.zope.org:/tmp/cvs-serv25901/CMFDefault

Modified Files:
      Tag: CMF-1_3-branch
	RegistrationTool.py 
Log Message:
 - Merge changes from CMFHotfix_20031026.


=== CMF/CMFDefault/RegistrationTool.py 1.13.4.1 => 1.13.4.2 ===
--- CMF/CMFDefault/RegistrationTool.py:1.13.4.1	Fri Mar 14 11:09:48 2003
+++ CMF/CMFDefault/RegistrationTool.py	Mon Oct 27 11:58:33 2003
@@ -164,6 +164,11 @@
             raise 'NotFound', 'The username you entered could not be found.'
 
         password = member.getPassword()
+        email = member.getProperty( 'email' )
+
+        if email is None:
+            raise ValueError( 'Member %s has no e-mail address.'
+                            % new_member_id )
     
         # Rather than have the template try to use the mailhost, we will
         # render the message ourselves and send it from here (where we
@@ -172,6 +177,7 @@
                                                    , self.REQUEST
                                                    , member=member
                                                    , password=password
+                                                   , email=email
                                                    )
     
         host = self.MailHost