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/lib/formatter.rb | |
| parent | a8c109baca4d02cc8aed454e231518c1f8ec1844 (diff) | |
| parent | bdc1581556b86ba25a385c9309db714eeaba1ca1 (diff) | |
Merge pull request #1265 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/formatter.rb')
| -rw-r--r-- | app/lib/formatter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index 36cdae9f7..f1a751f84 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -308,9 +308,9 @@ class Formatter end standard = Extractor.extract_entities_with_indices(text, options) - xmpp = Extractor.extract_xmpp_uris_with_indices(text, options) + extra = Extractor.extract_extra_uris_with_indices(text, options) - Extractor.remove_overlapping_entities(special + standard + xmpp) + Extractor.remove_overlapping_entities(special + standard + extra) end def html_friendly_extractor(html, options = {}) |