aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlambadalambda <gitgud@rogerbraun.net>2017-08-18 05:33:42 -0400
committerlambadalambda <gitgud@rogerbraun.net>2017-08-18 05:33:42 -0400
commit8004ee8ccfa63181fb103ea50db3b10956d81ce9 (patch)
tree6674cbabcbeb2fe4447ab5e849c54b8140f74319 /lib
parent552cfdbe11193baf019fc97cc56356882cf60bc0 (diff)
parent6c70980bff4d1c2eb5f7b85325bb1b1ddf82e70c (diff)
downloadpleroma-8004ee8ccfa63181fb103ea50db3b10956d81ce9.tar.gz
Merge branch 'patch-1' into 'develop'
Fix finmoji title attribute. See merge request !23
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/formatter.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
index 5c19d8f87..e95a314b4 100644
--- 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