diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2018-09-02 00:14:25 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2018-10-05 20:49:34 +0000 |
| commit | b1be9415effadf81e557eddee3f60bdf0fa359af (patch) | |
| tree | b307cd06e023c68977f39736fc8aaecf89a9bc5f /lib/pleroma/web/common_api/common_api.ex | |
| parent | f7ba393bb94f29bb79bc34ff3c708f929f61cc57 (diff) | |
| download | pleroma-b1be9415effadf81e557eddee3f60bdf0fa359af.tar.gz | |
Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
This reverts commit d31bbb1cfe04ca6073a322bcf77239e7d4b79839, reversing
changes made to 340ab3cb9068d444b77213e07beb8c2c3ca128b9.
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, 8 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 125c57d05..2ab50c968 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -85,7 +85,14 @@ 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["no_attachment_links"]), + make_content_html( + status, + mentions, + attachments, + tags, + data["content_type"] || "text/plain", + data["no_attachment_links"] + ), context <- make_context(inReplyTo), cw <- data["spoiler_text"], object <- |