|
|
@ -303,7 +303,7 @@ class ApplicationController < ActionController::Base
|
|
|
|
current_domain_session = session[:"#{default_yun_session}"]
|
|
|
|
current_domain_session = session[:"#{default_yun_session}"]
|
|
|
|
if current_domain_session
|
|
|
|
if current_domain_session
|
|
|
|
# existing session
|
|
|
|
# existing session
|
|
|
|
(User.active.find(current_domain_session) rescue nil)
|
|
|
|
User.current = (User.active.find(current_domain_session) rescue nil)
|
|
|
|
elsif autologin_user = try_to_autologin
|
|
|
|
elsif autologin_user = try_to_autologin
|
|
|
|
autologin_user
|
|
|
|
autologin_user
|
|
|
|
elsif params[:format] == 'atom' && params[:key] && request.get? && accept_rss_auth?
|
|
|
|
elsif params[:format] == 'atom' && params[:key] && request.get? && accept_rss_auth?
|
|
|
|