X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a5e5cbc73999d004998e1e90b1b19796a94b077d..bdd5c317a7a765a653d98baa062e192ddf615804:/app/models/diary_entry.rb

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index fe48ee8dc..4b2058b9d 100644
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -1,10 +1,12 @@
 class DiaryEntry < ActiveRecord::Base
   belongs_to :user
-  has_many :diary_comments, :order => "id"
+  has_many :diary_comments, :include => :user,
+                            :conditions => "users.visible = 1",
+                            :order => "diary_comments.id"
 
   validates_presence_of :title, :body
   validates_length_of :title, :within => 1..255
-  validates_length_of :language, :within => 2..3
+  validates_length_of :language, :within => 2..3, :allow_nil => true
   validates_numericality_of :latitude, :allow_nil => true
   validates_numericality_of :longitude, :allow_nil => true
   validates_associated :user