mastofe

commit: e1ebf363528fbbd3753436530baa6cc08ef5dd88
parent: ae6dd081210bd892812811e16094cda618466e8f
Author: Clworld <clworld@ggtea.org>
Date:   Sat, 18 Nov 2017 02:22:31 +0900

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


Diffstat:
M
app/controllers/admin/custom_emojis_controller.rb
5
+++--

1 file changed, 3 insertions(+), 2 deletions(-)
diff --git 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')