]> cat aescling's git repositories - mastodon.git/commitdiff
Fix #6526: Only store redirect location if not in JSON format (#6528)
authorEugen Rochko <eugen@zeonfederated.com>
Wed, 21 Feb 2018 23:51:30 +0000 (00:51 +0100)
committerGitHub <noreply@github.com>
Wed, 21 Feb 2018 23:51:30 +0000 (00:51 +0100)
app/controllers/application_controller.rb

index b38a68467779026084f78823060362495d3f26fc..17c9dade8ab6a3225653b5fb6d0d07bc34ea4380 100644 (file)
@@ -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!