Update to leaflet 1.0.2

[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 bf9f2a9a24975ffaad3f40e6a9da1a880f40d940..61d95ba11b9f7fffe891c18915b4e78383a70f7e 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -102,7 +102,7 @@ class DiaryEntryController < ApplicationController
 
   def list
     if params[:display_name]
 
   def list
     if params[:display_name]

-      @this_user = User.active.find_by_display_name(params[:display_name])
+      @this_user = User.active.find_by(:display_name => params[:display_name])

 
       if @this_user
         @title = t "diary_entry.list.user_title", :user => @this_user.display_name
 
       if @this_user
         @title = t "diary_entry.list.user_title", :user => @this_user.display_name


@@ -150,7 +150,7 @@ class DiaryEntryController < ApplicationController
 
   def rss
     if params[:display_name]
 
   def rss
     if params[:display_name]

-      user = User.active.find_by_display_name(params[:display_name])
+      user = User.active.find_by(:display_name => params[:display_name])

 
       if user
         @entries = user.diary_entries
 
       if user
         @entries = user.diary_entries