X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/691aab02fcd76cde87e0f55ddf61b3a288ab5a36..a21824f754ddea0e45beb87cdaa371e74359e2e2:/app/controllers/diary_entry_controller.rb?ds=inline

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 13d3121a5..a3b37b931 100644
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -20,6 +20,7 @@ class DiaryEntryController < ApplicationController
     @diary_comment = @entry.diary_comments.build(params[:diary_comment])
     @diary_comment.user = @user
     if @diary_comment.save
+      Notifier::deliver_diary_comment_notification(@diary_comment)
       redirect_to :controller => 'diary_entry', :action => 'view', :display_name => @entry.user.display_name, :id => @entry.id
     else
       render :action => 'view'
@@ -29,11 +30,16 @@ class DiaryEntryController < ApplicationController
   def list
     if params[:display_name]
       @this_user = User.find_by_display_name(params[:display_name])
-      @title = @this_user.display_name + "'s diary"
-      @entry_pages, @entries = paginate(:diary_entries,
-                                        :conditions => ['user_id = ?', @this_user.id],
-                                        :order => 'created_at DESC',
-                                        :per_page => 20)
+      if @this_user
+        @title = @this_user.display_name + "'s diary"
+        @entry_pages, @entries = paginate(:diary_entries,
+                                          :conditions => ['user_id = ?', @this_user.id],
+                                          :order => 'created_at DESC',
+                                          :per_page => 20)
+      else
+        @not_found_user = params[:display_name]
+        render :action => 'no_such_user', :status => :not_found
+      end
     else
       @title = "Users' diaries"
       @entry_pages, @entries = paginate(:diary_entries,