Ticket #3654: notify-on-create.patch

trac/ticket/notification.py

@@ -220 +220 @@
 
         # Suppress the updater from the recipients
         if not notify_updater:
-            cursor.execute("SELECT author FROM ticket_change WHERE ticket=%s "
-                           "ORDER BY time DESC LIMIT 1", (tktid,))
-            (updater, ) = cursor.fetchone() 
+            updater = None
+            try:
+                cursor.execute("SELECT author FROM ticket_change WHERE ticket=%s "
+                               "ORDER BY time DESC LIMIT 1", (tktid,))
+                (updater, ) = cursor.fetchone() 
+            except TypeError, e:
+                # assume it was because fetchone returned no results (e.g., new ticket)
+                try:
+                    cursor.execute("SELECT reporter FROM ticket WHERE id=%s LIMIT 1", (tktid,))
+                    (updater, ) = cursor.fetchone() 
+                except Exception, e:
+                    self.log.exception("Failure identifying updater on ticket #%s: %s" % (tktid, e))
             torecipients = [r for r in torecipients if r and r != updater]
 
         return (torecipients, ccrecipients)