X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dbd88d893f3c3fce9cafd666b94396988646d81f..6c2093b29d74b145b85e61c4fff09b5f13afa0e5:/script/deliver-message

diff --git a/script/deliver-message b/script/deliver-message
index 46f9642e7..98e00d332 100755
--- a/script/deliver-message
+++ b/script/deliver-message
@@ -6,7 +6,7 @@ if recipient = ARGV[0].match(/^c-(\d+)-(\d+)-(.*)$/)
   comment = DiaryComment.find(recipient[1])
   digest = comment.digest
   date = comment.created_at
-  from = User.find(recipient[2])
+  from = comment.diary_entry.subscribers.find(recipient[2])
   to = comment.user
   token = recipient[3]
 elsif recipient = ARGV[0].match(/^m-(\d+)-(.*)$/)
@@ -25,7 +25,9 @@ exit 0 if date < 1.month.ago
 
 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!