logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 8004ee8ccfa63181fb103ea50db3b10956d81ce9
parent: 552cfdbe11193baf019fc97cc56356882cf60bc0
Author: lambadalambda <gitgud@rogerbraun.net>
Date:   Fri, 18 Aug 2017 05:33:42 -0400

Merge branch 'patch-1' into 'develop'

Fix finmoji title attribute.

See merge request !23

Diffstat:

Mlib/pleroma/formatter.ex2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex @@ -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