1
0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-27 07:55:04 +01:00

Merge branch 'patch-1' into 'develop'

Fix finmoji title attribute.

See merge request !23
This commit is contained in:
lambadalambda 2017-08-18 05:33:42 -04:00
commit 8004ee8ccf

View File

@ -91,7 +91,7 @@ defmodule Pleroma.Formatter do
]
Enum.reduce(emoji_list, text, fn (emoji, text) ->
String.replace(text, ":#{String.replace(emoji, "_", "")}:", "<img height='32px' width='32px' alt='#{emoji}' title='#{emoji}' src='#{Pleroma.Web.Endpoint.static_url}/finmoji/128px/#{emoji}-128.png' />")
String.replace(text, ":#{String.replace(emoji, "_", "")}:", "<img height='32px' width='32px' alt='#{emoji}' title='#{String.replace(emoji, "_", "")}' src='#{Pleroma.Web.Endpoint.static_url}/finmoji/128px/#{emoji}-128.png' />")
end)
end
end