X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c3e2e6462f293596aef5d5de18b0a173edc046c7..d377e8b4f23e6bad925eb2efa904baa7e1531fa6:/app/models/diary_comment.rb diff --git a/app/models/diary_comment.rb b/app/models/diary_comment.rb index 5ace3d158..2796eb612 100644 --- 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 - validates_presence_of :body - validates_associated :diary_entry + validates :body, :presence => true + validates :diary_entry, :user, :associated => true 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 @@ -20,7 +20,7 @@ class DiaryComment < ActiveRecord::Base md5.hexdigest end -private + private def spam_check user.spam_check