aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorWim Vanderbauwhede <Wim.Vanderbauwhede@mail.be>2018-04-24 13:28:55 +0100
committerWim Vanderbauwhede <Wim.Vanderbauwhede@mail.be>2018-04-24 13:28:55 +0100
commit7517155544f85f0bd085c0ef0dd843fdac1fc4fd (patch)
tree8dad098ad53d68188226a258d74efe42bc5cba21 /lib
parent52ee91efcedb1a004c27e27f252420c1f91f18dc (diff)
downloadpleroma-7517155544f85f0bd085c0ef0dd843fdac1fc4fd.tar.gz
Changed to support \r\n and \n
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api_controller.ex2
1 files changed, 1 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 0ee90496f..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,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
def update_profile(%{assigns: %{user: user}} = conn, params) do
params =
if bio = params["description"] do
- bio_brs = Regex.replace(~r/\r\n/,bio,"<br>")
+ bio_brs = Regex.replace(~r/\r?\n/,bio,"<br>")
Map.put(params, "bio", bio_brs)
else
params