fixes for #1865

app/logical/current_user.rb

@@ -46,6 +46,14 @@ class CurrentUser
     Thread.current[:safe_mode]
   end
 
+  def self.without_safe_mode
+    prev = Thread.current[:safe_mode]
+    Thread.current[:safe_mode] = false
+    yield
+  ensure
+    Thread.current[:safe_mode] = prev
+  end
+
   def self.set_safe_mode(req)
     if req.host =~ /safe/
       Thread.current[:safe_mode] = true

app/logical/moderator/tag_batch_change.rb

@@ -10,6 +10,7 @@ module Moderator
 
       updater = User.find(updater_id)
 
+      CurrentUser.without_safe_mode do
         CurrentUser.scoped(updater, updater_ip_addr) do
           ::Post.tag_match(antecedent).each do |post|
             tags = (post.tag_array - normalized_antecedent + normalized_consequent).join(" ")
@@ -19,3 +20,4 @@ module Moderator
       end
     end
   end
+end

app/logical/post_query_builder.rb

@@ -114,7 +114,6 @@ class PostQueryBuilder
 
     if CurrentUser.safe_mode?
       relation = relation.where(:rating => "s")
-      # relation = relation.where("created_at <= ?", 3.months.ago)
     end
 
     relation = add_range_relation(q[:post_id], "posts.id", relation)

app/models/artist.rb

@@ -182,6 +182,7 @@ class Artist < ActiveRecord::Base
   module BanMethods
     def ban!
       Post.transaction do
+        CurrentUser.without_safe_mode do
           begin
             Post.tag_match(name).each do |post|
               begin
@@ -205,6 +206,7 @@ class Artist < ActiveRecord::Base
         end
       end
     end
+  end
 
   module SearchMethods
     def active

app/models/tag_alias.rb

@@ -126,6 +126,7 @@ class TagAlias < ActiveRecord::Base
   end
 
   def update_posts
+    CurrentUser.without_safe_mode do
       Post.raw_tag_match(antecedent_name).find_each do |post|
         escaped_antecedent_name = Regexp.escape(antecedent_name)
         fixed_tags = post.tag_string.sub(/(?:\A| )#{escaped_antecedent_name}(?:\Z| )/, " #{consequent_name} ").strip
@@ -139,6 +140,7 @@ class TagAlias < ActiveRecord::Base
       antecedent_tag.fix_post_count if antecedent_tag
       consequent_tag.fix_post_count if consequent_tag
     end
+  end
 
   def rename_wiki_and_artist
     antecedent_wiki = WikiPage.titled(antecedent_name).first

app/models/tag_implication.rb

@@ -126,6 +126,7 @@ class TagImplication < ActiveRecord::Base
   end
 
   def update_posts
+    CurrentUser.without_safe_mode do
       Post.raw_tag_match(antecedent_name).find_each do |post|
         fixed_tags = "#{post.tag_string} #{descendant_names}".strip
         CurrentUser.scoped(creator, creator_ip_addr) do
@@ -135,6 +136,7 @@ class TagImplication < ActiveRecord::Base
         end
       end
     end
+  end
   
   def normalize_names
     self.antecedent_name = antecedent_name.downcase.tr(" ", "_")