jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#1865: Remove unnecessary safe mode for alias/implications

Browse Source 
These use Post.raw_tag_match, while the bug only exists when using
Post.tag_match.
This commit is contained in:
Toks
2013-08-08 14:12:52 -04:00
parent 3323f4e251
commit 4c8b1a56d9
2 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/models/tag_alias.rb
View File

@@ -126,21 +126,19 @@ class TagAlias < ActiveRecord::Base
end end
def update_posts def update_posts
CurrentUser.without_safe_mode do Post.without_timeout do
Post.without_timeout do Post.raw_tag_match(antecedent_name).find_each do |post|
Post.raw_tag_match(antecedent_name).find_each do |post| escaped_antecedent_name = Regexp.escape(antecedent_name)
escaped_antecedent_name = Regexp.escape(antecedent_name) fixed_tags = post.tag_string.sub(/(?:\A| )#{escaped_antecedent_name}(?:\Z| )/, " #{consequent_name} ").strip
fixed_tags = post.tag_string.sub(/(?:\A| )#{escaped_antecedent_name}(?:\Z| )/, " #{consequent_name} ").strip CurrentUser.scoped(creator, creator_ip_addr) do
CurrentUser.scoped(creator, creator_ip_addr) do post.update_attributes(
post.update_attributes( :tag_string => fixed_tags
:tag_string => fixed_tags )
)
end
end end
antecedent_tag.fix_post_count if antecedent_tag
consequent_tag.fix_post_count if consequent_tag
end end
antecedent_tag.fix_post_count if antecedent_tag
consequent_tag.fix_post_count if consequent_tag
end end
end end

16
app/models/tag_implication.rb
View File

@@ -126,15 +126,13 @@ class TagImplication < ActiveRecord::Base
end end
def update_posts def update_posts
CurrentUser.without_safe_mode do Post.without_timeout do
Post.without_timeout do Post.raw_tag_match(antecedent_name).find_each do |post|
Post.raw_tag_match(antecedent_name).find_each do |post| fixed_tags = "#{post.tag_string} #{descendant_names}".strip
fixed_tags = "#{post.tag_string} #{descendant_names}".strip CurrentUser.scoped(creator, creator_ip_addr) do
CurrentUser.scoped(creator, creator_ip_addr) do post.update_attributes(
post.update_attributes( :tag_string => fixed_tags
:tag_string => fixed_tags )
)
end
end end
end end
end end