From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 21 Feb 2018 23:51:30 +0000 (+0100)
Subject: Fix #6526: Only store redirect location if not in JSON format (#6528)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=d8bc64bb09750b9e47c1ea1bb502e88a8dd676d5;p=mastodon.git

Fix #6526: Only store redirect location if not in JSON format (#6528)
---

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b38a68467..17c9dade8 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -35,7 +35,7 @@ class ApplicationController < ActionController::Base
   end
 
   def store_current_location
-    store_location_for(:user, request.url)
+    store_location_for(:user, request.url) unless request.format == :json
   end
 
   def require_admin!