Ticket #2766: notification.patch

trac/ticket/notification.py

@@ -178 +178 @@
         toemails = []
         ccemails = []
         for recipient in torecipients:
-            if recipient.find('@') >= 0:
+                if self.email_map.has_key(recipient):
+                toemails.append(self.email_map[recipient])
+            elif recipient.find('@') >= 0:
                 toemails.append(recipient)
-            elif self.email_map.has_key(recipient):
-                toemails.append(self.email_map[recipient])
         for recipient in ccrecipients:
-            if recipient.find('@') >= 0:
+                if self.email_map.has_key(recipient):
+                ccemails.append(self.email_map[recipient])
+            elif recipient.find('@') >= 0:
                 ccemails.append(recipient)
-            elif self.email_map.has_key(recipient):
-                ccemails.append(self.email_map[recipient])
 
         # Remove duplicates
         toresult = []