Merge remote-tracking branch 'openstreetmap/pull/903'

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

diff --git a/app/models/diary_comment.rb b/app/models/diary_comment.rb
index 5ace3d1580b4d2413613d79af3bcd993d0414573..2796eb612ac8eea869270fc7cee2f72bb73b6da8 100644 (file)
--- a/app/models/diary_comment.rb
+++ b/app/models/diary_comment.rb
@@ -2,13 +2,13 @@ class DiaryComment < ActiveRecord::Base
   belongs_to :user
   belongs_to :diary_entry
 
   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_save :spam_check
 
   def body
 
   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
   end
 
   def digest


@@ -20,7 +20,7 @@ class DiaryComment < ActiveRecord::Base
     md5.hexdigest
   end
 
     md5.hexdigest
   end
 

-private
+  private

 
   def spam_check
     user.spam_check
 
   def spam_check
     user.spam_check