Ticket #4552: sage-4552.patch

sage/server/notebook/twist.py

@@ -1879 +1879 @@
         
     def render(self, request):        
         input_boxes = ['username', 'password', 'retype_password']
+        if notebook.conf()['email']:
+            input_boxes.append('email')
         is_valid_dict = {'username': is_valid_username, 'password': is_valid_password,
                          'retype_password': do_passwords_match, 'email': is_valid_email}
         
@@ -1957 +1959 @@
             try:
                 e = filled_in['email'] if notebook.conf()['email'] else ''
                 self.userdb.add_user(filled_in['username'], request.args['password'][0],
-                                     e, force=True)
+                                     e)
             except ValueError:
                 template_dict['username_taken'] = True
                 errors_found()