From: Tom Hughes <tom@compton.nu>
Date: Tue, 15 Nov 2011 14:49:38 +0000 (+0000)
Subject: Looks like @body is special somehow so use @text instead
X-Git-Tag: live~6622
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/d4853bdc29acf8581fe240475a6ca856ca3a4119

Looks like @body is special somehow so use @text instead
---

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 03923e9e7..2b6574a97 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -62,7 +62,7 @@ class Notifier < ActionMailer::Base
     @locale = message.recipient.preferred_language_from(I18n.available_locales)
     @to_user = message.recipient.display_name
     @from_user = message.sender.display_name
-    @body = message.body
+    @text = message.body
     @title = message.title
     @readurl = url_for(:host => SERVER_URL,
                        :controller => "message", :action => "read",
diff --git a/app/views/notifier/message_notification.text.erb b/app/views/notifier/message_notification.text.erb
index 8c5fce74e..c91c68be6 100644
--- a/app/views/notifier/message_notification.text.erb
+++ b/app/views/notifier/message_notification.text.erb
@@ -3,7 +3,7 @@
 <%= t'notifier.message_notification.header', :from_user => @from_user, :subject => @title %>
 
 ==
-<%= @body %>
+<%= @text %>
 ==
 
 <%= t'notifier.message_notification.footer1', :readurl => @readurl %>