Merge remote-tracking branch 'upstream/pull/3381'

[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 5f53e81b65ca05e89ef89f1319a89e2f85feb653..312e1e54caf3464649fc52e71ff34e5a8fec32f4 100644 (file)
--- a/app/controllers/diary_entries_controller.rb
+++ b/app/controllers/diary_entries_controller.rb
@@ -81,7 +81,7 @@ class DiaryEntriesController < ApplicationController
 
       # Notify current subscribers of the new comment
       @entry.subscribers.visible.each do |user|
 
       # Notify current subscribers of the new comment
       @entry.subscribers.visible.each do |user|

-        Notifier.diary_comment_notification(@diary_comment, user).deliver_later if current_user != user
+        UserMailer.diary_comment_notification(@diary_comment, user).deliver_later if current_user != user

       end
 
       # Add the commenter to the subscribers if necessary
       end
 
       # Add the commenter to the subscribers if necessary


@@ -235,6 +235,8 @@ class DiaryEntriesController < ApplicationController
   end
 
   def comments
   end
 
   def comments

+    @title = t ".title", :user => @user.display_name
+

     conditions = { :user_id => @user }
 
     conditions[:visible] = true unless can? :unhidecomment, DiaryEntry
     conditions = { :user_id => @user }
 
     conditions[:visible] = true unless can? :unhidecomment, DiaryEntry