Fix regression #5467: fixes emoji copy (#5739)

2017-11-18 02:22:31 +09:00 · 2017-11-18 02:22:31 +09:00 · 6547ebee48
parent eaf6f94773
commit 6547ebee48
1 changed files with 3 additions and 2 deletions
--- a/app/controllers/admin/custom_emojis_controller.rb
+++ b/app/controllers/admin/custom_emojis_controller.rb
@ -45,9 +45,10 @@ module Admin
    def copy
      authorize @custom_emoji, :copy?

-      emoji = CustomEmoji.find_or_create_by(domain: nil, shortcode: @custom_emoji.shortcode)
+      emoji = CustomEmoji.find_or_initialize_by(domain: nil, shortcode: @custom_emoji.shortcode)
+      emoji.image = @custom_emoji.image

-      if emoji.update(image: @custom_emoji.image)
+      if emoji.save
        flash[:notice] = I18n.t('admin.custom_emojis.copied_msg')
      else
        flash[:alert] = I18n.t('admin.custom_emojis.copy_failed_msg')