diff --git a/app/logical/d_text.rb b/app/logical/d_text.rb index 54b1ed704..8fec5c3f8 100644 --- a/app/logical/d_text.rb +++ b/app/logical/d_text.rb @@ -75,7 +75,7 @@ class DText str = str.gsub(/\bcomment #(\d+)/i, %{comment #\\1}) str = str.gsub(/\bpool #(\d+)/i, %{pool #\\1}) str = str.gsub(/\buser #(\d+)/i, %{user #\\1}) - str = str.gsub(/\bartist #(\d+)/i, %{user #\\1}) + str = str.gsub(/\bartist #(\d+)/i, %{artist #\\1}) end def self.parse_list(str, options = {}) diff --git a/app/views/comments/partials/index/_list.html.erb b/app/views/comments/partials/index/_list.html.erb index ef1bf14b3..933784e82 100644 --- a/app/views/comments/partials/index/_list.html.erb +++ b/app/views/comments/partials/index/_list.html.erb @@ -5,7 +5,7 @@
<% if post.comments.hidden(CurrentUser.user).count > 0 || (params[:controller] == "comments" && post.comments.count > 6) %> - + <%= link_to "Show all comments", comments_path(:post_id => post.id, :include_below_threshold => true), :remote => true %> <% end %>