Fixes OSQA-406, Validation hash is not reset when email address is changed (enabling...

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@528 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/views/auth.py b/forum/views/auth.py
index 073b9b605b33eda330cad30f68d37484057f87f5..049bd61c7369193b28d4ee802265d152f365cfc9 100644 (file)
--- a/forum/views/auth.py
+++ b/forum/views/auth.py
@@ -270,9 +270,7 @@ def send_validation_email(request):
     else:
         try:
             hash = ValidationHash.objects.get(user=request.user, type='email')
-            if hash.expiration < datetime.datetime.now():
-                hash.delete()
-                return send_validation_email(request)
+            hash.delete()
         except:
             hash = ValidationHash.objects.create_new(request.user, 'email', [request.user.email])
 

diff --git a/forum/views/readers.py b/forum/views/readers.py
index 4fbc6bcbb13bd56b4003e27890606e605e2894a7..81599027e47cb5a68b7f6f7eadf703628eeb5841 100644 (file)
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -259,7 +259,7 @@ def answer_redirect(request, answer):
         filter = Q(score__gt=answer.score) | Q(score=answer.score, added_at__lt=answer.added_at)
     else:
         raise Http404()
-        
+
     count = answer.question.answers.filter(Q(marked=True) | filter).count()
     pagesize = pc.pagesize(request)
 

diff --git a/forum/views/users.py b/forum/views/users.py
index 7cb32249a907fda1cf5b0d3c368421cbae6d0d12..306747a6d746570ccaa117d45fbc8f8c20b4cb84 100644 (file)
--- a/forum/views/users.py
+++ b/forum/views/users.py
@@ -78,6 +78,12 @@ def edit_user(request, id):
                 user.email = new_email\r
                 user.email_isvalid = False\r
 \r
+                try:\r
+                    hash = ValidationHash.objects.get(user=request.user, type='email')\r
+                    hash.delete()\r
+                except:\r
+                    pass\r
+\r
             if settings.EDITABLE_SCREEN_NAME:\r
                 user.username = sanitize_html(form.cleaned_data['username'])\r
             user.real_name = sanitize_html(form.cleaned_data['realname'])\r