diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-11-17 20:17:12 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-11-17 20:17:12 +0000 |
| commit | 94c5a11cdaebee605f379f66ab57306523b5f148 (patch) | |
| tree | ff74cb98b87270b709dd8d67759a068933b1e475 /app/controllers | |
| parent | 45f18b8f494153fd63871d60782da992e847ec16 (diff) | |
| parent | 4a2fc2d444a80050ad9ba5e83aa5e69d3148ab95 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/custom_emojis_controller.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/admin/custom_emojis_controller.rb b/app/controllers/admin/custom_emojis_controller.rb index 693d28b1f..509f7a48f 100644 --- 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') |