diff --git a/app/assets/javascripts/blacklists.js b/app/assets/javascripts/blacklists.js index 279964b79..d35007e6e 100644 --- a/app/assets/javascripts/blacklists.js +++ b/app/assets/javascripts/blacklists.js @@ -98,7 +98,7 @@ tags.push("rating:" + $post.data("rating")); tags.push("user:" + $post.data("user")); - return Danbooru.is_subset(tags, blacklist.require) && !Danbooru.intersect(tags, blacklist.exclude).length; + return (blacklist.require.length > 0 || blacklist.exclude.length > 0) && Danbooru.is_subset(tags, blacklist.require) && !Danbooru.intersect(tags, blacklist.exclude).length; } Danbooru.Blacklist.post_hide = function(post) { diff --git a/app/assets/javascripts/utility.js b/app/assets/javascripts/utility.js index c34c2ba64..f52a0edb3 100644 --- a/app/assets/javascripts/utility.js +++ b/app/assets/javascripts/utility.js @@ -13,7 +13,7 @@ Danbooru.is_subset = function(array, subarray) { var all = true; - + $.each(subarray, function(i, val) { if ($.inArray(val, array) === -1) { all = false; diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb index 9fb06d710..37a764818 100644 --- a/app/views/layouts/default.html.erb +++ b/app/views/layouts/default.html.erb @@ -9,7 +9,7 @@ <% unless CurrentUser.user.blacklisted_tags.blank? %> - "> + "> <% end %> <% if flash[:notice] =~ /error/ %>