Use new ActionMail API to send emails

[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..47c638f3a2b0c68b8517d0fda4d11e4dbe7b0326 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -60,7 +60,7 @@ class DiaryEntryController < ApplicationController
     @diary_comment.user = @user
     if @diary_comment.save
       if @diary_comment.user != @entry.user
-        Notifier::deliver_diary_comment_notification(@diary_comment)
+        Notifier.diary_comment_notification(@diary_comment).deliver
       end
 
       redirect_to :controller => 'diary_entry', :action => 'view', :display_name => @entry.user.display_name, :id => @entry.id
@@ -111,8 +111,6 @@ class DiaryEntryController < ApplicationController
   end
 
   def rss
-    request.format = :rss
-
     if params[:display_name]
       user = User.find_by_display_name(params[:display_name], :conditions => { :status => ["active", "confirmed"] })