--- a/gpp/core/functions.py	Sun Sep 19 23:55:48 2010 +0000
+++ b/gpp/core/functions.py	Mon Sep 20 00:40:01 2010 +0000
@@ -9,14 +9,15 @@
 import mailer
 
 
-def send_mail(subject, message, from_email, recipient_list, 
-        fail_silently = False, auth_user = None, auth_password = None):
+def send_mail(subject, message, from_email, recipient_list,
+        fail_silently=False, auth_user=None, auth_password=None,
+        expedite=False):
     """The main gpp send email function.
     Use this function to send email from the site. It will obey debug settings and
-    log all emails.
+    log all emails. The expedite flag, when True, will bypass the mail queue.
     """
 
-    if settings.MAILER_ENQUEUE_MAIL:
+    if settings.MAILER_ENQUEUE_MAIL and not expedite:
         mailer.enqueue_mail(subject, message, from_email, recipient_list)
     elif settings.GPP_SEND_EMAIL:
         django.core.mail.send_mail(subject, message, from_email, recipient_list,