Merged r17432 from trunk to 3.3-stable (#29191).

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17434 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 4 insertions, 3 deletions

diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index 7e16ee6a8..652efd7c4 100644
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -65,7 +65,7 @@ class MailHandler < ActionMailer::Base
     %w(project status tracker category priority assigned_to fixed_version).each do |option|
       options[:issue][option.to_sym] = env[option] if env[option]
     end
-    %w(allow_override unknown_user no_permission_check no_account_notice default_group project_from_subaddress).each do |option|
+    %w(allow_override unknown_user no_permission_check no_account_notice no_notification default_group project_from_subaddress).each do |option|
       options[option.to_sym] = env[option] if env[option]
     end
     if env['private']
diff --git a/test/unit/mail_handler_test.rb b/test/unit/mail_handler_test.rb
index 634968ef4..dd4b60d50 100644
--- a/test/unit/mail_handler_test.rb
+++ b/test/unit/mail_handler_test.rb
@@ -1073,12 +1073,13 @@ class MailHandlerTest < ActiveSupport::TestCase
     options = MailHandler.extract_options_from_env({
       'tracker' => 'defect',
       'project' => 'foo',
-      'unknown_user' => 'create'
+      'unknown_user' => 'create',
+      'no_notification' => '1'
     })
 
     assert_equal({
       :issue => {:tracker => 'defect', :project => 'foo'},
-      :unknown_user => 'create'
+      :unknown_user => 'create', :no_notification => '1'
     }, options)
   end