diff options
author | Rafael França <rafael@franca.dev> | 2019-07-25 22:14:37 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-25 22:14:37 -0400 |
commit | e53e25328094f86cbfa7d0e77fb2618a0a2b3518 (patch) | |
tree | 9a90748fc70e1e0add528cf85b935bcb69b9cef2 /actionmailbox/app/controllers/rails/conductor | |
parent | 65dcc9d1597b5472ed59ea6c73686d48942f76f6 (diff) | |
parent | ce88f6bd2561f3ff31e39c70ae82b301ee0ddd79 (diff) | |
download | rails-e53e25328094f86cbfa7d0e77fb2618a0a2b3518.tar.gz rails-e53e25328094f86cbfa7d0e77fb2618a0a2b3518.tar.bz2 rails-e53e25328094f86cbfa7d0e77fb2618a0a2b3518.zip |
Merge pull request #36765 from kylekeesling/patch-1
fix filenames of attachments created via the inbound email conductor
Diffstat (limited to 'actionmailbox/app/controllers/rails/conductor')
-rw-r--r-- | actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb b/actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb index 8713f545f5..cd8b12dcde 100644 --- a/actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb +++ b/actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb @@ -23,7 +23,7 @@ module Rails Mail.new(params.require(:mail).permit(:from, :to, :cc, :bcc, :in_reply_to, :subject, :body).to_h).tap do |mail| mail[:bcc]&.include_in_headers = true params[:mail][:attachments].to_a.each do |attachment| - mail.add_file(filename: attachment.path, content: attachment.read) + mail.add_file(filename: attachment.original_filename, content: attachment.read) end end end |