Skip to content

O
OHR Support
Commit dfc93734 authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

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
parent e0bda97b
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
app/models/mailer.rb
View file @ dfc93734
......@@ -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]
recipients.delete(User.current.mail) if recipients
cc.delete(User.current.mail) if cc
@author ||= User.current
if @author.pref[:no_self_notified]
recipients.delete(@author.mail) if recipients
cc.delete(@author.mail) if cc
end
# Blind carbon copy recipients
if Setting.bcc_recipients?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment