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 @@

Body

- <%= format_text(@dmail.body) %> +
+ <%= format_text(@dmail.body) %> +

<%= 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 @@

  • <%= link_to "Reply", new_forum_post_path(:topic_id => @forum_topic.id) %>
  • <% if !@forum_topic.new_record? && @forum_topic.editable_by?(CurrentUser.user) %>
  • <%= link_to "Edit", edit_forum_topic_path(@forum_topic) %>
  • - <% if CurrentUser.is_moderator? %> + <% if CurrentUser.is_janitor? %>
  • <%= link_to "Delete", forum_topic_path(@forum_topic), :remote => true, :method => :delete, :confirm => "Do you want to delete this forum topic?" %>
  • <% 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")