diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-23 01:50:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-23 01:50:17 +0200 |
| commit | 9c8e602163811fc9a21c5ae78d53d46d7dbc8db7 (patch) | |
| tree | 2588674edc8940dae61cf94c7ff98ba10100fa80 /app/models | |
| parent | 846cd4e8381c891816cf814582304b534db4ee5f (diff) | |
Fix custom emojis not detected when used in content warning (#5049)
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/status.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index ca261a201..f11064cbd 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -132,7 +132,7 @@ class Status < ApplicationRecord end def emojis - CustomEmoji.from_text(text, account.domain) + CustomEmoji.from_text([spoiler_text, text].join(' '), account.domain) end after_create :store_uri, if: :local? |