From 7a6040379f1dfe9e4d1118ca1dfd29edbee0b5b4 Mon Sep 17 00:00:00 2001
From: Toks <tttoksss@gmail.com>
Date: Mon, 6 May 2013 14:53:57 -0400
Subject: [PATCH 1/4] remove duplicate active check

---
 app/presenters/post_presenter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/presenters/post_presenter.rb b/app/presenters/post_presenter.rb
index d3678c13d..f78b94c58 100644
--- a/app/presenters/post_presenter.rb
+++ b/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

From 824de83fe298e5fedbc224502ffcce70149c97e2 Mon Sep 17 00:00:00 2001
From: Toks <tttoksss@gmail.com>
Date: Mon, 6 May 2013 14:54:14 -0400
Subject: [PATCH 2/4] fix blacklists

---
 app/assets/javascripts/blacklists.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/blacklists.js b/app/assets/javascripts/blacklists.js
index af2320f1b..2be852410 100644
--- a/app/assets/javascripts/blacklists.js
+++ b/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];

From 93ebf12cf7a9ecc5a370ee5fcf83f407c2d2b337 Mon Sep 17 00:00:00 2001
From: Toks <tttoksss@gmail.com>
Date: Mon, 6 May 2013 15:17:00 -0400
Subject: [PATCH 3/4] link wiki header for reltags; fixes #1437

---
 app/assets/javascripts/related_tag.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/related_tag.js b/app/assets/javascripts/related_tag.js
index b4586cc34..4b22e004a 100644
--- a/app/assets/javascripts/related_tag.js
+++ b/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(
-          query.replace(/_/g, " ")
-        )
+        header
       )
     );
 

From dcd00a52a14bcd8e18afe8790d57562eb215139f Mon Sep 17 00:00:00 2001
From: Toks <tttoksss@gmail.com>
Date: Mon, 6 May 2013 15:29:02 -0400
Subject: [PATCH 4/4] fix argument error regression

---
 app/models/tag.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/tag.rb b/app/models/tag.rb
index 6ddc6475b..0a9e6b0aa 100644
--- a/app/models/tag.rb
+++ b/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