diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-04-29 09:26:47 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-04-29 09:26:47 +0000 |
| commit | b7584edcea024739fcef1ce6608058766d9fd73f (patch) | |
| tree | 526d08731dd4efd6fc38f55b7bdf8807c9dc29e2 /lib | |
| parent | 4d55d7c95e8409f5018f3321d7e653b6349b9ba6 (diff) | |
| parent | 6908f29e0a170131d2f328d68d36f054b592a0a3 (diff) | |
| download | pleroma-b7584edcea024739fcef1ce6608058766d9fd73f.tar.gz | |
Merge branch 'patch-bio' into 'develop'
replace newlines in profiles with <br>
See merge request pleroma/pleroma!136
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index 6cf8682b8..e8fc9c291 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -347,7 +347,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do def update_profile(%{assigns: %{user: user}} = conn, params) do params = if bio = params["description"] do - Map.put(params, "bio", bio) + bio_brs = Regex.replace(~r/\r?\n/,bio,"<br>") + Map.put(params, "bio", bio_brs) else params end |