diff options
| author | ThibG <thib@sitedethib.com> | 2020-02-09 12:56:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-09 12:56:12 +0100 |
| commit | d3aaa08730901e7c97c6aeb1ebf56f2a027c78a2 (patch) | |
| tree | 9fcb99dab28b01e0f85fbe7f27f406f92a031903 /app/lib/formatter.rb | |
| parent | a2cfe3daaadabfaad71969a44c460bd76b8405ff (diff) | |
| parent | 432033743c409356bd11e0d7d96f14a3cc82fb77 (diff) | |
Merge pull request #1280 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/formatter.rb')
| -rw-r--r-- | app/lib/formatter.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index f1a751f84..fcc99d009 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -77,6 +77,8 @@ class Formatter def reformat(html) sanitize(html, Sanitize::Config::MASTODON_STRICT) + rescue ArgumentError + '' end def plaintext(status) |