diff options
| author | lain <lain@soykaf.club> | 2018-05-13 10:56:11 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-05-13 10:56:11 +0200 |
| commit | 76722ea9c8dfbb8fefe247883946aa5c872d9a49 (patch) | |
| tree | 34020541df1d6684e935cfd09f36cb6eed7b13f6 /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
| parent | a3d1d4894fdd8dd0133e1d2c6fde9d95f49dfcc7 (diff) | |
| parent | bb864e96ad4e0be470da78baa000019f571e30db (diff) | |
| download | pleroma-76722ea9c8dfbb8fefe247883946aa5c872d9a49.tar.gz | |
Merge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuses
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
| -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..960925f42 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 |