nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Eugen Rochko 2018-02-22 00:51:30 +01:00 committed by GitHub
parent 90f12f2e5a
commit d8bc64bb09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@ -35,7 +35,7 @@ class ApplicationController < ActionController::Base
end end
def store_current_location def store_current_location
store_location_for(:user, request.url) store_location_for(:user, request.url) unless request.format == :json
end end
def require_admin! def require_admin!