Change server_settings to smtp_settings to avoid deprecation warning.

[rails.git] / app / views / user / diary.rhtml

diff --git a/app/views/user/diary.rhtml b/app/views/user/diary.rhtml
index abe896db90b11fa2003a791574a5cde1ffbbf249..106cfd73fad2eac13d999ddcf6530a8389094834 100644 (file)
--- a/app/views/user/diary.rhtml
+++ b/app/views/user/diary.rhtml
@@ -1,8 +1,8 @@
 <h2><%= @this_user.display_name %>'s diary</h2>
-<% if @this_user.id == @user.id %>
+<% if @user and @this_user.id == @user.id %>
   <%= link_to 'new post', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %>
 <% end %>
 
 <h3>recent posts:</h3>
-FIXME: geoRSS needed<br><br>
+<br><br>
 <%= render :partial => 'diary_entry/diary_entry', :collection => @this_user.diary_entries %>