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

Merge branch 'master' of https://github.com/r888888888/danbooru

Browse Source
This commit is contained in:
Toks
2013-07-31 19:57:15 -04:00
parent 0764c1a45c 33f8ad000c
commit ed3c332062
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/models/tag_alias.rb
View File

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

14
app/models/tag_implication.rb
View File

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