diff options
| author | ThibG <thib@sitedethib.com> | 2020-01-24 17:28:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-24 17:28:22 +0100 |
| commit | 0be67df4f0a64367d9e376b06bd3fd2fb9ca8195 (patch) | |
| tree | 2eaa85c899033aab9bd1b2f9da2d727ce5788e16 /app/models/custom_emoji.rb | |
| parent | a8c109baca4d02cc8aed454e231518c1f8ec1844 (diff) | |
| parent | bdc1581556b86ba25a385c9309db714eeaba1ca1 (diff) | |
Merge pull request #1265 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/custom_emoji.rb')
| -rw-r--r-- | app/models/custom_emoji.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb index 0dacaf654..d177cf281 100644 --- a/app/models/custom_emoji.rb +++ b/app/models/custom_emoji.rb @@ -67,7 +67,7 @@ class CustomEmoji < ApplicationRecord end class << self - def from_text(text, domain) + def from_text(text, domain = nil) return [] if text.blank? shortcodes = text.scan(SCAN_RE).map(&:first).uniq |