Disambiguate order clause.

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index 8568160774f8d671dfefd8a8746a5eefbfdd3649..dd1f9882a7a4726ffff14147292b1891a0584893 100644 (file)
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -2,7 +2,7 @@ class DiaryEntry < ActiveRecord::Base
   belongs_to :user
   has_many :diary_comments, :include => :user,
                             :conditions => "users.visible = 1",
   belongs_to :user
   has_many :diary_comments, :include => :user,
                             :conditions => "users.visible = 1",

-                            :order => "id"
+                            :order => "diary_comments.id"

 
   validates_presence_of :title, :body
   validates_numericality_of :latitude, :allow_nil => true
 
   validates_presence_of :title, :body
   validates_numericality_of :latitude, :allow_nil => true