Merge branch 'rails42'

[rails.git] / app / models / message.rb

diff --git a/app/models/message.rb b/app/models/message.rb
index f897af3c2905df4a96d5d95107236b92bb20607e..b05d005b04f95ea1eec343228744d744bc2a8935 100644 (file)
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -9,10 +9,6 @@ class Message < ActiveRecord::Base
   validates_inclusion_of :message_read, :in => [ true, false ]
   validates_as_utf8 :title
 
-  attr_accessible :title, :body
-
-  after_initialize :set_defaults
-
   def self.from_mail(mail, from, to)
     if mail.multipart?
       if mail.text_part
@@ -26,14 +22,14 @@ class Message < ActiveRecord::Base
       body = mail.decoded
     end
 
-    message = Message.new({
+    message = Message.new(
       :sender => from,
       :recipient => to,
       :sent_on => mail.date.new_offset(0),
       :title => mail.subject.sub(/\[OpenStreetMap\] */, ""),
       :body => body,
       :body_format => "text"
-    }, :without_protection => true)
+    )
   end
 
   def body
@@ -49,10 +45,4 @@ class Message < ActiveRecord::Base
     md5 << body
     md5.hexdigest
   end
-
-private
-
-  def set_defaults
-    self.body_format = "markdown" unless self.attribute_present?(:body_format)
-  end
 end