diff options
| author | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2019-02-07 16:41:20 +0100 |
|---|---|---|
| committer | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2019-05-03 16:25:58 +0200 |
| commit | 85b5c60694e07d3bfb1f885d5fda14be6b7bade9 (patch) | |
| tree | ee2bbac82f1b13823da540be035dbb3aaea90a05 /lib | |
| parent | 027ded0df799266d74d9680bd7ef24450efc910f (diff) | |
| download | pleroma-85b5c60694e07d3bfb1f885d5fda14be6b7bade9.tar.gz | |
Pleroma.Formatter: width/height to class=emoji
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/formatter.ex | 4 | ||||
| -rw-r--r-- | lib/pleroma/html.ex | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index dab8910c1..0ec6bcee0 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -113,9 +113,7 @@ defmodule Pleroma.Formatter do html = if not strip do - "<img height='32px' width='32px' alt='#{emoji}' title='#{emoji}' src='#{ - MediaProxy.url(file) - }' />" + "<img class='emoji' alt='#{emoji}' title='#{emoji}' src='#{MediaProxy.url(file)}' />" else "" end diff --git a/lib/pleroma/html.ex b/lib/pleroma/html.ex index 726c370ad..d1da746de 100644 --- a/lib/pleroma/html.ex +++ b/lib/pleroma/html.ex @@ -151,6 +151,7 @@ defmodule Pleroma.HTML.Scrubber.TwitterText do Meta.allow_tag_with_these_attributes("img", [ "width", "height", + "class", "title", "alt" ]) @@ -221,6 +222,7 @@ defmodule Pleroma.HTML.Scrubber.Default do Meta.allow_tag_with_these_attributes("img", [ "width", "height", + "class", "title", "alt" ]) |