Update Potlatch 2 to 2.3-127-gbce938f build

[rails.git] / script / deliver-message

diff --git a/script/deliver-message b/script/deliver-message
index f28a9d9f3b82e0a58e97cfc3f1bcc32da563ff88..b6c679b0a6cf3e863f9e765eed61d78915f6bb09 100755 (executable)
--- a/script/deliver-message
+++ b/script/deliver-message
@@ -20,10 +20,16 @@ exit 0 unless recipient[3] == digest[0,6]
 
 mail = Mail.new(STDIN.readlines.join)
 
 
 mail = Mail.new(STDIN.readlines.join)
 

+if mail.multipart?
+  body = mail.html_part || mail.text_part
+else
+  body = mail.body
+end
+

 message = Message.new(:sender => from, :recipient => to,
                       :sent_on => mail.date.new_offset(0),
                       :title => mail.subject.sub(/\[OpenStreetMap\] */, ""),
 message = Message.new(:sender => from, :recipient => to,
                       :sent_on => mail.date.new_offset(0),
                       :title => mail.subject.sub(/\[OpenStreetMap\] */, ""),

-                      :body => mail.body.decoded)
+                      :body => body.decoded)

 message.save!
 
 Notifier.message_notification(message).deliver
 message.save!
 
 Notifier.message_notification(message).deliver