From f5240d06fecb33c60604d3ef170a7e3322df6b24 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Mon, 18 Mar 2013 17:12:44 -0700
Subject: [PATCH] fixes #945

---
 app/views/dmails/show.html.erb                   | 4 +++-
 app/views/forum_topics/_secondary_links.html.erb | 2 +-
 script/fixes/008.rb                              | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/dmails/show.html.erb b/app/views/dmails/show.html.erb
index 3e3d558b1..ef752c220 100644
--- a/app/views/dmails/show.html.erb
+++ b/app/views/dmails/show.html.erb
@@ -11,7 +11,9 @@
       </ul>
       
       <h3>Body</h3>
-      <%= format_text(@dmail.body) %>
+      <div class="prose">
+        <%= format_text(@dmail.body) %>
+      </div>
 
       <p>
         <%= link_to "Respond", new_dmail_path(:respond_to_id => @dmail) %>
diff --git a/app/views/forum_topics/_secondary_links.html.erb b/app/views/forum_topics/_secondary_links.html.erb
index c1cb794d7..2bccebc80 100644
--- a/app/views/forum_topics/_secondary_links.html.erb
+++ b/app/views/forum_topics/_secondary_links.html.erb
@@ -10,7 +10,7 @@
       <li><%= link_to "Reply", new_forum_post_path(:topic_id => @forum_topic.id) %></li>
       <% if !@forum_topic.new_record? && @forum_topic.editable_by?(CurrentUser.user) %>
         <li><%= link_to "Edit", edit_forum_topic_path(@forum_topic) %></li>
-        <% if CurrentUser.is_moderator? %>
+        <% if CurrentUser.is_janitor? %>
           <li><%= link_to "Delete", forum_topic_path(@forum_topic), :remote => true, :method => :delete, :confirm => "Do you want to delete this forum topic?" %></li>
         <% end %>
       <% end %>
diff --git a/script/fixes/008.rb b/script/fixes/008.rb
index 6cabc0ad2..c378542fe 100644
--- a/script/fixes/008.rb
+++ b/script/fixes/008.rb
@@ -6,3 +6,5 @@ ActiveRecord::Base.connection.execute("set statement_timeout = 0")
 Tag.find_each do |tag|
   tag.fix_post_count
 end
+
+ActiveRecord::Base.connection.execute("update comments set updater_id = creator_id where updater_id <> creator_id")