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 0931ab1cbc53487e7e2d99455f161c6be3f0d50a..20e8a6a85ae33cd5ecac462dc070af70de9b08f2 100644 (file)
--- 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 b9dda303be41430fc4086849580f7e308747099b..4d11f854d710a625f9b5a5f690b51fe4faf87136 100644 (file)
--- a/forum/utils/mail.py
+++ b/forum/utils/mail.py
@@ -102,15 +102,15 @@ def send_email(subject, recipients, template, context={}, sender=None, images=[]
 \r
     for recipient in recipients:\r
         if isinstance(recipient, str):\r
-            recipient_data = [('recipient', recipient)]\r
+            recipient_data = ('recipient', recipient)\r
             recipient_context = None\r
         elif isinstance(recipient, (list, tuple)) and len(recipient) == 2:\r
             name, email = recipient\r
-            recipient_data = [(name, email)]\r
+            recipient_data = (name, email)\r
             recipient_context = None\r
         elif isinstance(recipient, (list, tuple)) and len(recipient) == 3:\r
             name, email, recipient_context = recipient\r
-            recipient_data = [(name, email)]\r
+            recipient_data = (name, email)\r
         else:\r
             raise Exception('bad argument for recipients')\r
 \r