Redmine 4.1.1

app/models/news.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 # Redmine - project management software
-# Copyright (C) 2006-2017  Jean-Philippe Lang
+# Copyright (C) 2006-2019  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -24,7 +26,6 @@ class News < ActiveRecord::Base
   validates_presence_of :title, :description
   validates_length_of :title, :maximum => 60
   validates_length_of :summary, :maximum => 255
-  attr_protected :id
 
   acts_as_attachable :edit_permission => :manage_news,
                      :delete_permission => :manage_news
@@ -36,7 +37,7 @@ class News < ActiveRecord::Base
   acts_as_watchable
 
   after_create :add_author_as_watcher
-  after_create :send_notification
+  after_create_commit :send_notification
 
   scope :visible, lambda {|*args|
     joins(:project).
@@ -92,7 +93,7 @@ class News < ActiveRecord::Base
 
   def send_notification
     if Setting.notified_events.include?('news_added')
-      Mailer.news_added(self).deliver
+      Mailer.deliver_news_added(self)
     end
   end
 end