diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-11-12 08:50:26 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-11-12 08:50:26 +0000 |
| commit | 99bc175f0257fb0cb9275cba94df662ed219eacf (patch) | |
| tree | 2068e9446378b0ed604b6489db4fed1188b693ef /lib | |
| parent | ccec59047b314786d2fe9d6a03197019cc4dd7a1 (diff) | |
| parent | b0e4e0cf2a151900d29da56424f596f3defa23e3 (diff) | |
| download | pleroma-99bc175f0257fb0cb9275cba94df662ed219eacf.tar.gz | |
Merge branch 'title-injection-change' into 'develop'
Title injection change
See merge request pleroma/pleroma!3132
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/fallback/redirect_controller.ex | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/pleroma/web/fallback/redirect_controller.ex b/lib/pleroma/web/fallback/redirect_controller.ex index 712991c18..1ac1319f8 100644 --- a/lib/pleroma/web/fallback/redirect_controller.ex +++ b/lib/pleroma/web/fallback/redirect_controller.ex @@ -41,8 +41,7 @@ defmodule Pleroma.Web.Fallback.RedirectController do response = index_content - |> String.replace(~r/<title>.+?<\/title>/, title) - |> String.replace("<!--server-generated-meta-->", tags <> preloads) + |> String.replace("<!--server-generated-meta-->", tags <> preloads <> title) conn |> put_resp_content_type("text/html") @@ -60,8 +59,7 @@ defmodule Pleroma.Web.Fallback.RedirectController do response = index_content - |> String.replace(~r/<title>.+?<\/title>/, title) - |> String.replace("<!--server-generated-meta-->", preloads) + |> String.replace("<!--server-generated-meta-->", preloads <> title) conn |> put_resp_content_type("text/html") |