github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-30 07:34:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Keep the flash when redirecting for login_required

Browse Source
This commit is contained in:
Robin Ward 2017-05-25 14:10:15 -04:00
parent ca965f83c3
commit 6eb6c25816
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/application_controller.rb
View File

@ -554,8 +554,9 @@ class ApplicationController < ActionController::Base
def redirect_to_login_if_required def redirect_to_login_if_required
return if current_user || (request.format.json? && is_api?) return if current_user || (request.format.json? && is_api?)
# redirect user to the SSO page if we need to log in AND SSO is enabled
if SiteSetting.login_required? if SiteSetting.login_required?
flash.keep
if SiteSetting.enable_sso? if SiteSetting.enable_sso?
# save original URL in a session so we can redirect after login # save original URL in a session so we can redirect after login
session[:destination_url] = destination_url session[:destination_url] = destination_url