diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-08-31 09:51:20 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-08-31 09:51:20 +0000 |
| commit | 58539e13573681238fdd4d4e7334666389084be3 (patch) | |
| tree | ba9a5a9e33b4afb79044c5d8da663b150010bd68 /lib/pleroma/web/common_api/common_api.ex | |
| parent | 340ab3cb9068d444b77213e07beb8c2c3ca128b9 (diff) | |
| download | pleroma-58539e13573681238fdd4d4e7334666389084be3.tar.gz | |
Revert "Merge branch 'feature/rich-text' into 'develop'"
This reverts merge request !309
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 2ab50c968..125c57d05 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -85,14 +85,7 @@ defmodule Pleroma.Web.CommonAPI do {to, cc} <- to_for_user_and_mentions(user, mentions, inReplyTo, visibility), tags <- Formatter.parse_tags(status, data), content_html <- - make_content_html( - status, - mentions, - attachments, - tags, - data["content_type"] || "text/plain", - data["no_attachment_links"] - ), + make_content_html(status, mentions, attachments, tags, data["no_attachment_links"]), context <- make_context(inReplyTo), cw <- data["spoiler_text"], object <- |