Merge remote-tracking branch 'upstream/pull/1961'

[rails.git] / script / deliver-message

diff --git a/script/deliver-message b/script/deliver-message
index c15d365962e45124e6a7148c51f89dc6a22c6e88..15a9fbdc7f613f7d14cb9b6119a6dc7719d39afc 100755 (executable)
--- a/script/deliver-message
+++ b/script/deliver-message
@@ -23,9 +23,11 @@ end
 exit 0 unless token == digest[0, 6]
 exit 0 if date < 1.month.ago
 
 exit 0 unless token == digest[0, 6]
 exit 0 if date < 1.month.ago
 

-message.update_attribute(:message_read, true) if message
+message.update(:message_read => true) if message

 
 

-mail = Mail.new(STDIN.readlines.join)
+mail = Mail.new(STDIN.read
+                     .encode(:universal_newline => true)
+                     .encode(:crlf_newline => true))

 
 message = Message.from_mail(mail, from, to)
 message.save!
 
 message = Message.from_mail(mail, from, to)
 message.save!