OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

Fix custom emoji copy not copying file (#5298)

pull/5302/head v2.0.0rc1
Eugen Rochko 2017-10-10 15:18:27 +02:00 committed by GitHub
parent 4bb3e4eeba
commit 61d3ecc805
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/admin/custom_emojis_controller.rb
View File

@ -28,8 +28,7 @@ module Admin
end end
def copy def copy
emoji = @custom_emoji.dup emoji = CustomEmoji.new(domain: nil, shortcode: @custom_emoji.shortcode, image: @custom_emoji.image)
emoji.domain = nil
if emoji.save if emoji.save
redirect_to admin_custom_emojis_path, notice: I18n.t('admin.custom_emojis.copied_msg') redirect_to admin_custom_emojis_path, notice: I18n.t('admin.custom_emojis.copied_msg')