From: rick <rick@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Tue, 11 May 2010 21:24:51 +0000 (+0000)
Subject: fix to handling of email recipients in subscription lists for questions
X-Git-Tag: live~902
X-Git-Url: https://git.openstreetmap.org/osqa.git/commitdiff_plain/27d8fd2539e21cb23732ad82bd6f24f9f0f7b617

fix to handling of email recipients in subscription lists for questions

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

diff --git a/forum/management/commands/send_email_alerts.py b/forum/management/commands/send_email_alerts.py
index 0931ab1..20e8a6a 100644
--- a/forum/management/commands/send_email_alerts.py
+++ b/forum/management/commands/send_email_alerts.py
@@ -112,7 +112,7 @@ class Command(NoArgsCommand):
                 context['new_questions'] = False
 
             if context['new_users'] or context['activity_in_subscriptions'] or context['new_questions']:
-                send_email(digest_subject, (u.username, u.email), "notifications/digest.html", context, threaded=False)
+                send_email(digest_subject, [(u.username, u.email)], "notifications/digest.html", context, threaded=False)
 
 
     def get_digest_control(self):
diff --git a/forum/utils/mail.py b/forum/utils/mail.py
index b9dda30..4d11f85 100644
--- a/forum/utils/mail.py
+++ b/forum/utils/mail.py
@@ -102,15 +102,15 @@ def send_email(subject, recipients, template, context={}, sender=None, images=[]
 
     for recipient in recipients:
         if isinstance(recipient, str):
-            recipient_data = [('recipient', recipient)]
+            recipient_data = ('recipient', recipient)
             recipient_context = None
         elif isinstance(recipient, (list, tuple)) and len(recipient) == 2:
             name, email = recipient
-            recipient_data = [(name, email)]
+            recipient_data = (name, email)
             recipient_context = None
         elif isinstance(recipient, (list, tuple)) and len(recipient) == 3:
             name, email, recipient_context = recipient
-            recipient_data = [(name, email)]
+            recipient_data = (name, email)
         else:
             raise Exception('bad argument for recipients')