Commit caf70bde authored by maeda's avatar maeda

Fix "Undefined local variable sender_email" error in...

Fix "Undefined local variable sender_email" error in MailHandler#receive_message_reply when receiving a reply to a locked topic (#31503).

Patch by Go MAEDA.


git-svn-id: https://svn.redmine.org/redmine/trunk@18239 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent ac9c1def
......@@ -274,7 +274,7 @@ class MailHandler < ActionMailer::Base
add_attachments(reply)
reply
else
logger&.info "MailHandler: ignoring reply from [#{sender_email}] to a locked topic"
logger&.info "MailHandler: ignoring reply from [#{email.from.first}] to a locked topic"
end
end
end
......
......@@ -1002,6 +1002,17 @@ class MailHandlerTest < ActiveSupport::TestCase
assert_equal Message.find(1), m.parent
end
def test_reply_to_a_locked_topic
# Lock the topic
topic = Message.find(2).parent
topic.update_attribute :locked, true
assert_no_difference('topic.replies_count') do
m = submit_email('message_reply_by_subject.eml')
assert_not_kind_of Message, m
end
end
def test_should_convert_tags_of_html_only_emails
with_settings :text_formatting => 'textile' do
issue = submit_email('ticket_html_only.eml', :issue => {:project => 'ecookbook'})
......
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