From f96cd644bc086c9773d8e4774d2d976be3790a68 Mon Sep 17 00:00:00 2001 From: albert Date: Sun, 10 Mar 2013 00:35:36 -0500 Subject: [PATCH] add sanity check for update category post counts method --- app/assets/javascripts/post_moderation.js | 4 ++-- app/models/tag.rb | 6 ++++-- app/views/layouts/default.html.erb | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/post_moderation.js b/app/assets/javascripts/post_moderation.js index 82b35fc54..655372d27 100644 --- a/app/assets/javascripts/post_moderation.js +++ b/app/assets/javascripts/post_moderation.js @@ -9,14 +9,14 @@ } Danbooru.PostModeration.hide_or_show_approve_and_disapprove_links = function() { - if (Danbooru.meta("post-is-approvable") != "true") { + if (Danbooru.meta("post-is-approvable") !== "true") { $("#approve").hide(); $("#disapprove").hide(); } } Danbooru.PostModeration.hide_or_show_delete_and_undelete_links = function() { - if (Danbooru.meta("post-is-deleted") == "true") { + if (Danbooru.meta("post-is-deleted") === "true") { $("#delete").hide(); } else { $("#undelete").hide(); diff --git a/app/models/tag.rb b/app/models/tag.rb index d621ad5c5..df7594ebb 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -98,8 +98,10 @@ class Tag < ActiveRecord::Base def update_category_post_counts old_field = "tag_count_#{Danbooru.config.reverse_tag_category_mapping[category_was]}".downcase new_field = "tag_count_#{category_name}".downcase - Post.without_timeout do - Post.raw_tag_match(name).update_all("#{old_field} = #{old_field} - 1, #{new_field} = #{new_field} + 1") + if old_field != new_field + Post.without_timeout do + Post.raw_tag_match(name).update_all("#{old_field} = #{old_field} - 1, #{new_field} = #{new_field} + 1") + end end end diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb index 0e4313a4c..7a2340fd5 100644 --- a/app/views/layouts/default.html.erb +++ b/app/views/layouts/default.html.erb @@ -19,7 +19,7 @@ <%= auto_discovery_link_tag :atom, posts_path(:format => "atom", :tags => params[:tags]) %> <%= stylesheet_link_tag "application", :media => "screen" %> <%= javascript_include_tag "application" %> - <%= Danbooru.config.custom_html_header_content %> + <%= raw Danbooru.config.custom_html_header_content %> <%= yield :html_header %>