|
|
|
@ -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?
|
|
|
|
|