diff options
author | kaniini <nenolod@gmail.com> | 2019-07-10 13:27:59 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2019-07-10 13:27:59 +0000 |
commit | f295b9fba9c8e54bd5a92447d55d0c60c0a0cc0c (patch) | |
tree | 0aaf9f3b762f624faee78d409f805feb535780fb /lib/pleroma/web/uploader_controller.ex | |
parent | 42422f3ff2d3a918f04e2d73b8d2f6867a51b5a7 (diff) | |
parent | ed8ce21a224b7b8d7753f2c4f66bfdfd3d9a0e68 (diff) | |
download | pleroma-f295b9fba9c8e54bd5a92447d55d0c60c0a0cc0c.tar.gz |
Merge branch 'localization' into 'develop'
Error Localization
See merge request pleroma/pleroma!1396
Diffstat (limited to 'lib/pleroma/web/uploader_controller.ex')
-rw-r--r-- | lib/pleroma/web/uploader_controller.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/uploader_controller.ex b/lib/pleroma/web/uploader_controller.ex index d11e8e63e..bf09775e6 100644 --- a/lib/pleroma/web/uploader_controller.ex +++ b/lib/pleroma/web/uploader_controller.ex @@ -12,7 +12,7 @@ defmodule Pleroma.Web.UploaderController do end def callbacks(conn, _) do - send_resp(conn, 400, "bad request") + render_error(conn, :bad_request, "bad request") end defp process_callback(conn, pid, params) when is_pid(pid) do @@ -24,6 +24,6 @@ defmodule Pleroma.Web.UploaderController do end defp process_callback(conn, _, _) do - send_resp(conn, 400, "bad request") + render_error(conn, :bad_request, "bad request") end end |