Merge pull request #3045 from techAPJ/patch-2

FIX: redirect client to the original url after logging in for private in...
This commit is contained in:
Régis Hanol
2014-12-17 11:21:56 +01:00
2 changed files with 11 additions and 1 deletions

View File

@ -350,6 +350,8 @@ class ApplicationController < ActionController::Base
def redirect_to_login_if_required
return if current_user || (request.format.json? && api_key_valid?)
# save original URL in a cookie
cookies[:destination_url] = request.original_url unless request.original_url =~ /uploads/
redirect_to :login if SiteSetting.login_required?
end