lib/proxes/request.rb in proxes-0.9.9 vs lib/proxes/request.rb in proxes-0.9.12

- old
+ new

@@ -32,11 +32,11 @@ def duration Time.now.to_f - @started end def user_id - return env['omniauth.auth'].uid if env['omniauth.auth'] - env['rack.session']['user_id'] if env['rack.session'] + return env['rack.session']['user_id'] if env['rack.session'] + env['omniauth.auth'].uid if env['omniauth.auth'] end def user return nil if user_id.nil? @user ||= Ditty::User[user_id]