From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 22 Sep 2012 10:12:59 +0000 (+0000)
Subject: Use eager loaded #principal association instead of #user (#11904).
X-Git-Tag: 2.2.0~348
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=18d1c62ca8a8de3ecc0b8731335a49195dafd192;p=redmine.git

Use eager loaded #principal association instead of #user (#11904).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10442 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/models/project.rb b/app/models/project.rb
index 71ffdc8f5..9a65bdd2e 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -472,7 +472,7 @@ class Project < ActiveRecord::Base
   # Returns the users that should be notified on project events
   def notified_users
     # TODO: User part should be extracted to User#notify_about?
-    members.select {|m| m.mail_notification? || m.user.mail_notification == 'all'}.collect {|m| m.principal}
+    members.select {|m| m.principal.present? && (m.mail_notification? || m.principal.mail_notification == 'all')}.collect {|m| m.principal}
   end
 
   # Returns an array of all custom fields enabled for project issues