X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f0feca800d91ac1d23eb63ca17a45d8fd4d41920..945ff7911ca51dc250ffaba71f62821b5c0c0a95:/app/models/diary_comment.rb

diff --git a/app/models/diary_comment.rb b/app/models/diary_comment.rb
index 9d29f52b7..2796eb612 100644
--- a/app/models/diary_comment.rb
+++ b/app/models/diary_comment.rb
@@ -2,14 +2,13 @@ class DiaryComment < ActiveRecord::Base
   belongs_to :user
   belongs_to :diary_entry
 
-  validates_presence_of :body
-  validates_associated :diary_entry
+  validates :body, :presence => true
+  validates :diary_entry, :user, :associated => true
 
-  after_initialize :set_defaults
   after_save :spam_check
 
   def body
-    RichText.new(read_attribute(:body_format), read_attribute(:body))
+    RichText.new(self[:body_format], self[:body])
   end
 
   def digest
@@ -21,11 +20,7 @@ class DiaryComment < ActiveRecord::Base
     md5.hexdigest
   end
 
-private
-
-  def set_defaults
-    self.body_format = "markdown" unless self.attribute_present?(:body_format)
-  end
+  private
 
   def spam_check
     user.spam_check