Set server_url to test.host in test environments

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

diff --git a/app/controllers/diary_entries_controller.rb b/app/controllers/diary_entries_controller.rb
index f827bac3f165a00d1f94313975c291fbcf329979..d4a32efb212c8b9cfbf45e0b88a5ae0b80276fa6 100644 (file)
--- a/app/controllers/diary_entries_controller.rb
+++ b/app/controllers/diary_entries_controller.rb
@@ -129,7 +129,7 @@ class DiaryEntriesController < ApplicationController
     elsif params[:friends]
       if current_user
         @title = t "diary_entries.index.title_friends"
     elsif params[:friends]
       if current_user
         @title = t "diary_entries.index.title_friends"

-        @entries = DiaryEntry.where(:user_id => current_user.friend_users)
+        @entries = DiaryEntry.where(:user_id => current_user.friends)

       else
         require_user
         return
       else
         require_user
         return