Preserve background colour when marking messages read/unread

[rails.git] / app / controllers / diary_entry_controller.rb

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index c45d369ac1832acedadb22be2954535e4f3c5eb0..68d3a81ee93485e89ce5f37204011aff10ac6a1c 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -188,7 +188,10 @@ class DiaryEntryController < ApplicationController
 
   def comments
     @comment_pages, @comments = paginate(:diary_comments,
 
   def comments
     @comment_pages, @comments = paginate(:diary_comments,

-                                         :conditions => { :user_id => @this_user },
+                                         :conditions => { 
+                                           :user_id => @this_user,
+                                           :visible => true
+                                         },

                                          :order => 'created_at DESC',
                                          :per_page => 20)
     @page = (params[:page] || 1).to_i
                                          :order => 'created_at DESC',
                                          :per_page => 20)
     @page = (params[:page] || 1).to_i