diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-10-10 15:18:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-10 15:18:27 +0200 |
| commit | 61d3ecc8055cc9e72826e92638caa5f667023683 (patch) | |
| tree | d33f62450c9ae0622fb57ef99db5f236b36c14a4 /app/controllers/admin | |
| parent | 4bb3e4eeba3002ecae98efe6e1a0c05776fb2308 (diff) | |
Fix custom emoji copy not copying file (#5298)
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/custom_emojis_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/admin/custom_emojis_controller.rb b/app/controllers/admin/custom_emojis_controller.rb index dba9f1012..ca81f3255 100644 --- 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') |