From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 30 Dec 2019 03:38:18 +0000 (+0100)
Subject: Fix HTML error pages being returned when JSON is expected (#12713)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=353c94910bf02e2cd7f82ae47a55af3164926b3d;p=mastodon.git

Fix HTML error pages being returned when JSON is expected (#12713)

Fix #12509
See also #12214
---

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ca5229f79..3f9205381 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -136,6 +136,9 @@ class ApplicationController < ActionController::Base
   end
 
   def respond_with_error(code)
-    render "errors/#{code}", layout: 'error', status: code, formats: [:html]
+    respond_to do |format|
+      format.any  { render "errors/#{code}", layout: 'error', status: code, formats: [:html] }
+      format.json { render json: { error: Rack::Utils::HTTP_STATUS_CODES[code] }, status: code }
+    end
   end
 end