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

Fix #4829: DanbooruBot not properly handling BUR aliases when target tag has a wiki.

Browse Source
This commit is contained in:
evazion
2021-06-27 17:56:10 -05:00
parent 10ddbae07b
commit fef5f238a5
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/logical/tag_mover.rb
View File

@@ -151,13 +151,16 @@ class TagMover
old_artist.save!
end
# Merge the other names from both wikis, then mark the old wiki as deleted.
# Merge the other names from both wikis. Transfer the body from the old wiki
# to the new wiki if the new wiki has an empty body. Then mark the old wiki
# as deleted.
def merge_wikis!
old_wiki.lock!
new_wiki.lock!
new_wiki.other_names += old_wiki.other_names
new_wiki.is_deleted = false
new_wiki.body = old_wiki.body if new_wiki.body.blank? && old_wiki.body.present?
new_wiki.save!
old_wiki.body = "This tag has been moved to [[#{new_wiki.title}]]."