diff options
| author | ThibG <thib@sitedethib.com> | 2020-08-11 20:15:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-11 20:15:03 +0200 |
| commit | 59c44ce323d135223fcda0183c6fbdf64a79799a (patch) | |
| tree | a9f144ae0589d6a312e015dec7a66029bcb6131c /app/models | |
| parent | 03712799e2cd51613c8e73cbd6379c8058fae466 (diff) | |
| parent | 8ae52dc79235bc9ed6878bed857539d14e0b57da (diff) | |
Merge pull request #1398 from ThibG/glitch-soc/master
Merge upstream changes
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/form/custom_emoji_batch.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/form/custom_emoji_batch.rb b/app/models/form/custom_emoji_batch.rb index 6b7ea5355..f4fa84c10 100644 --- a/app/models/form/custom_emoji_batch.rb +++ b/app/models/form/custom_emoji_batch.rb @@ -30,7 +30,7 @@ class Form::CustomEmojiBatch private def custom_emojis - CustomEmoji.where(id: custom_emoji_ids) + @custom_emojis ||= CustomEmoji.where(id: custom_emoji_ids) end def update! |