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

cobodo · Dec 6, 2017 · 724d836 · 724d836
1 parent 62a1e11
commit 724d836
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/app/controllers/admin/custom_emojis_controller.rb b/app/controllers/admin/custom_emojis_controller.rb
@@ -45,9 +45,10 @@ def destroy
     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')