Merge branch 'master' of github.com:r888888888/danbooru

app/logical/d_text.rb

@@ -75,7 +75,7 @@ class DText
     str = str.gsub(/\bcomment #(\d+)/i, %{<a href="/comments/\\1">comment #\\1</a>})
     str = str.gsub(/\bpool #(\d+)/i, %{<a href="/pools/\\1">pool #\\1</a>})
     str = str.gsub(/\buser #(\d+)/i, %{<a href="/users/\\1">user #\\1</a>})
-    str = str.gsub(/\bartist #(\d+)/i, %{<a href="/artists/\\1">user #\\1</a>})
+    str = str.gsub(/\bartist #(\d+)/i, %{<a href="/artists/\\1">artist #\\1</a>})
   end
 
   def self.parse_list(str, options = {})

app/views/comments/partials/index/_list.html.erb

@@ -5,7 +5,7 @@
 
   <div class="row notices">
     <% if post.comments.hidden(CurrentUser.user).count > 0 || (params[:controller] == "comments" && post.comments.count > 6) %>
-      <span class="info" id="threshold-comments-notice-for-<%= post.id %>"%>
+      <span class="info" id="threshold-comments-notice-for-<%= post.id %>">
         <%= link_to "Show all comments", comments_path(:post_id => post.id, :include_below_threshold => true), :remote => true %>
       </span>
     <% end %>