Update to rails 3

[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 52ce742bfddf08870ae441e653e7855adb2e9458..13a8818fb063552a51e6ad13ff589d5aa8bd5859 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -111,8 +111,6 @@ class DiaryEntryController < ApplicationController
   end
 
   def rss
   end
 
   def rss

-    request.format = :rss
-

     if params[:display_name]
       user = User.find_by_display_name(params[:display_name], :conditions => { :status => ["active", "confirmed"] })
 
     if params[:display_name]
       user = User.find_by_display_name(params[:display_name], :conditions => { :status => ["active", "confirmed"] })