X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5fbc8ad3f471fde8c5defedc41bbb8374e13abdb..6ae23bed90f249ed943cc43f1bad0e40852f04bb:/app/controllers/diary_entry_controller.rb

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 643728dc4..a3b37b931 100644
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -30,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,