diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-31 03:41:00 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-31 03:41:00 +0000 |
| commit | a26d5e6b2aba5010c699df659d63048957b347a5 (patch) | |
| tree | 0b7a68d223d2663c6aa64d8f3144dee1705e4e4f /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
| parent | e838969495d2ca95406920ceef98d08f01d71192 (diff) | |
| parent | e7871ed05e9ebc8e2fe2f1afe966285e767c682f (diff) | |
| download | pleroma-a26d5e6b2aba5010c699df659d63048957b347a5.tar.gz | |
Merge branch 'feature/rich-text' into 'develop'
rich text support
See merge request pleroma/pleroma!309
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 2 |
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 b3a56b27e..244d31dda 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -423,7 +423,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do {String.trim(name, ":"), url} end) - bio_html = CommonUtils.format_input(bio, mentions, tags) + bio_html = CommonUtils.format_input(bio, mentions, tags, "text/plain") Map.put(params, "bio", bio_html |> Formatter.emojify(emoji)) else params |