From 0d8447fa824891b07040a030e7995e5d52854e42 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Sun, 17 Feb 2013 02:28:27 -0500
Subject: [PATCH] black list tag fix

---
 app/assets/javascripts/blacklists.js | 3 +--
 app/views/layouts/default.html.erb   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/blacklists.js b/app/assets/javascripts/blacklists.js
index e265070f9..e00f25b51 100644
--- a/app/assets/javascripts/blacklists.js
+++ b/app/assets/javascripts/blacklists.js
@@ -4,8 +4,7 @@
   Danbooru.Blacklist.blacklists = [];
   
   Danbooru.Blacklist.parse_entries = function() {
-    var raw = $('<textarea/>').html(Danbooru.meta("blacklisted-tags") || "[]").val();
-    var entries = ($.parseJSON(raw)).replace(/(rating:[qes])\w+/, "$1").split(/,/);
+    var entries = j(Danbooru.meta("blacklisted-tags") || "[]").replace(/(rating:[qes])\w+/, "$1").split(/,/);
     $.each(entries, function(i, tags) {
       var blacklist = {
         "tags": tags, 
diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb
index 88c6cde45..3cc7159d6 100644
--- a/app/views/layouts/default.html.erb
+++ b/app/views/layouts/default.html.erb
@@ -9,7 +9,7 @@
   <meta name="current-user-id" content="<%= CurrentUser.id %>">
   <meta name="user-comment-threshold" content="<%= CurrentUser.comment_threshold %>">
   <% unless CurrentUser.user.blacklisted_tags.blank? %>
-    <meta name="blacklisted-tags" content="<%= CurrentUser.user.blacklisted_tag_array.to_json %>">
+    <meta name="blacklisted-tags" content="<%= CurrentUser.user.blacklisted_tags.gsub(/\n|\r/, ",") %>">
   <% end %>
   <% if flash[:notice] =~ /error/ %>
     <meta name="errors" content="true">