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

app/assets/javascripts/blacklists.js

@@ -32,7 +32,7 @@
   }
 
   Danbooru.Blacklist.toggle_entry = function(e) {
-    var tags = $(e.target).html();
+    var tags = $(e.target).text();
     var match = $.grep(Danbooru.Blacklist.entries, function(entry, i) {
       return entry.tags === tags;
     })[0];

app/assets/javascripts/related_tag.js

@@ -155,6 +155,15 @@
       return "";
     }
 
+    query = query.replace(/_/g, " ");
+    var header = $("<em/>");
+
+    if (match = query.match(/^wiki:(.+)/)) {
+      header.html($("<a/>").attr("href", "/wiki_pages?title=" + match[1]).attr("target", "_blank").text(query));
+    } else {
+      header.text(query);
+    }
+
     var current = $("#upload_tag_string,#post_tag_string").val().match(/\S+/g) || [];
     var $div = $("<div/>");
     $div.addClass("tag-column")
@@ -164,9 +173,7 @@
     var $ul = $("<ul/>");
     $ul.append(
       $("<li/>").append(
-        $("<em/>").text(
+        header
-          query.replace(/_/g, " ")
-        )
       )
     );
 

app/models/tag.rb

@@ -76,7 +76,7 @@ class Tag < ActiveRecord::Base
         end
       end
 
-      def categories_for(tag_names, options)
+      def categories_for(tag_names, options = {})
         Array(tag_names).inject({}) do |hash, tag_name|
           hash[tag_name] = category_for(tag_name, options)
           hash

app/presenters/post_presenter.rb

@@ -166,7 +166,7 @@ class PostPresenter < Presenter
       end
     else
       first = true
-      @post.pools.active.each do |pool|
+      @post.pools.each do |pool|
         if first && template.params[:tags].blank?
           html += pool_link_html(template, pool, :include_rel => true)
           first = false