From fb21db27746ae08057420354ee352f56b2bfb9fb Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Sat, 9 Mar 2013 12:59:09 -0500
Subject: [PATCH] fixes #816

---
 app/views/wiki_page_versions/diff.html.erb | 2 +-
 config/environments/production.rb          | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/views/wiki_page_versions/diff.html.erb b/app/views/wiki_page_versions/diff.html.erb
index b5b3cb9fc..f0f286013 100644
--- a/app/views/wiki_page_versions/diff.html.erb
+++ b/app/views/wiki_page_versions/diff.html.erb
@@ -2,7 +2,7 @@
   <div id="a-diff">
     <h1>Wiki Page: <%= @thispage.title %></h1>
 
-    <p>Showing differences between <%= compact_time @thispage.created_at %> (<%= link_to @thispage.updater.name, user_path(@thispage.updater) %>) and <%= compact_time @otherpage.created_at %> (<%= link_to @otherpage.updater.name, user_path(@otherpage.updater) %>)</p>
+    <p>Showing differences between <%= compact_time @thispage.created_at %> (<%= link_to @thispage.updater_name, user_path(@thispage.updater) %>) and <%= compact_time @otherpage.created_at %> (<%= link_to @otherpage.updater_name, user_path(@otherpage.updater) %>)</p>
 
     <div>
       <%= wiki_page_diff(@thispage, @otherpage) %>
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 9f7bd0668..7948739ab 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -64,6 +64,4 @@ Danbooru::Application.configure do
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
   # config.active_record.auto_explain_threshold_in_seconds = 0.5
-  
-  config.action_mailer.delivery_method = :sendmail
 end