aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2017-12-11 16:21:43 +0000
committerlambda <pleromagit@rogerbraun.net>2017-12-11 16:21:43 +0000
commit4b06e46a3a97d6a14c7013fa952eade08ff7aef5 (patch)
tree3a81c91a4f8ed9975535c8b4ed7e4ac933c4806f /lib
parentd5a13c10ac6a9a5f8dbb1932ffc85260f079a2dc (diff)
parentb00e230760891d97c5d8c68e9e5c63b1545f10e9 (diff)
downloadpleroma-4b06e46a3a97d6a14c7013fa952eade08ff7aef5.tar.gz
Merge branch 'fix/tootdon-mentions' into 'develop'
Fix Tootdon linking the whole status when mentioning someone. See merge request pleroma/pleroma!39
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/common_api/utils.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index e60dff7dc..2b359dd72 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -95,7 +95,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
Enum.reduce(mentions, step_one, fn ({match, %User{ap_id: ap_id}, uuid}, text) ->
short_match = String.split(match, "@") |> tl() |> hd()
- String.replace(text, uuid, "<a href='#{ap_id}'>@#{short_match}</a>")
+ String.replace(text, uuid, "<span><a href='#{ap_id}'>@<span>#{short_match}</span></a></span>")
end)
end