From be1ea6dd431cb018b669feefc62765ec48f08366 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 16 Nov 2009 10:48:30 +0000 Subject: [PATCH] Use TMail to parse messages so that character set conversions are done correctly. Fixes #2461. --- script/deliver-message | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/script/deliver-message b/script/deliver-message index 39901fdf2..3df09f85f 100755 --- a/script/deliver-message +++ b/script/deliver-message @@ -1,7 +1,7 @@ #!/usr/bin/env ruby require File.dirname(__FILE__) + '/../config/environment' -require 'mailread' +require 'tmail' exit 0 unless recipient = ARGV[0].match(/^([cm])-(\d+)-(.*)$/) @@ -19,12 +19,12 @@ end exit 0 unless recipient[3] == digest[0,6] -mail = Mail.new(STDIN) +mail = TMail::Mail.parse(STDIN.readlines.join) message = Message.new(:sender => from, :recipient => to, :sent_on => Time.now.getutc, - :title => mail["Subject"], - :body => mail.body.map { |l| l.rstrip }.join("\n")) + :title => mail.subject, + :body => mail.body) message.save! Notifier::deliver_message_notification(message) -- 2.43.2