r1324: Merging r1323 from trunk

diff --git a/includes/class_notification.php b/includes/class_notification.php
index a875e899032ef0cd32e40dbe94ebab8849c52277..69f5697c082f245e7394f60b8c0f6c704ea6423c 100644 (file)
--- a/includes/class_notification.php
+++ b/includes/class_notification.php
@@ -160,6 +160,12 @@ class NotificationCenter
                        $this->roles["$role"] = array();
                }
                
+               $newbuggers = $this->registry->db->query("SELECT userid FROM " . TABLE_PREFIX . "useremail WHERE relation = " . $this->registry->emailoptions['relations']['-notapplicable-'] . " AND mask & " . $this->registry->emailoptions['notifications']['newbug']);
+               while ($newbug = $this->registry->db->fetch_array($newbuggers))
+               {
+                       $this->roles['-notapplicable-']["$newbug[userid]"] = $newbug['userid'];
+               }
+               
                $favorites = $this->registry->db->query("SELECT userid FROM " . TABLE_PREFIX . "favorite WHERE bugid = " . $this->registry->clean($this->bug['bugid'], TYPE_UINT));
                while ($fav = $this->registry->db->fetch_array($favorites))
                {
@@ -688,7 +694,14 @@ If you no longer want to receive email from us, please log into your account and
                                $this->bug['summary'],
                                $this->bug['bugid']
                        ));
-                       $this->registry->mail->send($this->users["$userid"]['email'], $this->users["$userid"]['displayname']);
+                       if (!empty($this->users["$userid"]['email']))
+                       {
+                               $this->registry->mail->send($this->users["$userid"]['email'], $this->users["$userid"]['displayname']);
+                       }
+                       else
+                       {
+                               $this->registry->debug("not sending an email to " . $userid . " because they don't have one?");
+                       }
                }
        }
 }