logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 61d3ecc8055cc9e72826e92638caa5f667023683
parent: 4bb3e4eeba3002ecae98efe6e1a0c05776fb2308
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Tue, 10 Oct 2017 15:18:27 +0200

Fix custom emoji copy not copying file (#5298)


Diffstat:

Mapp/controllers/admin/custom_emojis_controller.rb3+--
1 file changed, 1 insertion(+), 2 deletions(-)

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