elsif session[:token]
if @user = User.authenticate(:token => session[:token])
session[:user] = @user.id
- else
- reset_session
end
end
rescue Exception => ex
end
end
- I18n.locale = request.compatible_language_from(I18n.available_locales)
+ I18n.locale = request.compatible_language_from(I18n.available_locales) || I18n.default_locale
response.headers['Content-Language'] = I18n.locale.to_s
end
return [user, pass]
end
+ # used by oauth plugin to get the current user
+ def current_user
+ @user
+ end
+
# used by oauth plugin to set the current user
def current_user=(user)
@user=user