Fixed: email notification for changes I make still occurs when running…

Fixed: email notification for changes I make still occurs when running Repository.fetch_changesets (#1957). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2225 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixed: email notification for changes I make still occurs when running…
Fixed: email notification for changes I make still occurs when running Repository.fetch_changesets (#1957). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2225 e93f8b46-1217-0410-a6f0-8f06a7374b81
dfc93734 · Jean-Philippe Lang · e0bda97b · dfc93734
Commit dfc93734 authored Jan 03, 2009 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

mailer.rb app/models/mailer.rb +5 -3

No files found.
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -40,6 +40,7 @@ class Mailer < ActionMailer::Base
                    'Issue-Id' => issue.id,
                    'Issue-Author' => issue.author.login
    redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
+    @author = journal.user
    recipients issue.recipients
    # Watchers in cc
    cc(issue.watcher_recipients - @recipients)
@@ -209,9 +210,10 @@ class Mailer < ActionMailer::Base
  def create_mail
    # Removes the current user from the recipients and cc
    # if he doesn't want to receive notifications about what he does
-    if User.current.pref[:no_self_notified]
+    @author ||= User.current
-      recipients.delete(User.current.mail) if recipients
+    if @author.pref[:no_self_notified]
-      cc.delete(User.current.mail) if cc
+      recipients.delete(@author.mail) if recipients
+      cc.delete(@author.mail) if cc
    end
    # Blind carbon copy recipients
    if Setting.bcc_recipients?