From 0539522cf434a6e1480694734c06784847df140e Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Fri, 22 Nov 2019 14:44:33 +0800 Subject: [PATCH] =?UTF-8?q?domain=20session=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/application_controller.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index c30eb6b52..4c61fb1df 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -300,9 +300,10 @@ class ApplicationController < ActionController::Base def find_current_user uid_logger("user setup start: session[:user_id] is #{session[:user_id]}") uid_logger("0000000000000user setup start: session[:user_id] is #{session[:"#{default_yun_session}"]}") - if session[:"#{default_yun_session}"] + current_domain_session = session[:"#{default_yun_session}"] + if current_domain_session # existing session - (User.active.find(session[:user_id]) rescue nil) + (User.active.find(current_domain_session) rescue nil) elsif autologin_user = try_to_autologin autologin_user elsif params[:format] == 'atom' && params[:key] && request.get? && accept_rss_auth?