diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-08-31 09:53:00 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-08-31 09:53:00 +0000 |
| commit | d31bbb1cfe04ca6073a322bcf77239e7d4b79839 (patch) | |
| tree | ba9a5a9e33b4afb79044c5d8da663b150010bd68 /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
| parent | 340ab3cb9068d444b77213e07beb8c2c3ca128b9 (diff) | |
| parent | 58539e13573681238fdd4d4e7334666389084be3 (diff) | |
| download | pleroma-d31bbb1cfe04ca6073a322bcf77239e7d4b79839.tar.gz | |
Merge branch 'revert-a26d5e6b' into 'develop'
Revert "Merge branch 'feature/rich-text' into 'develop'"
See merge request pleroma/pleroma!313
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 244d31dda..b3a56b27e 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, "text/plain") + bio_html = CommonUtils.format_input(bio, mentions, tags) Map.put(params, "bio", bio_html |> Formatter.emojify(emoji)) else params |