@@ -129,7 +129,7 @@ module Mhs cookies[:remember_me_token] = { :value => model.remember_me_token , :expires => model.remember_me_token_expires_at } end set_current_user model - elsif not ActionController::HttpAuthentication::Basic.authorization(request).blank? && self.class.login_controller.mhs_authentication_system_options[:basic_auth_enabled] + elsif self.class.login_controller.mhs_authentication_system_options[:basic_auth_enabled] && !ActionController::HttpAuthentication::Basic.authorization(request).blank? model = authenticate_with_http_basic do |login_attribute_value, password| login_attribute = self.class.login_model.mhs_authentication_system_options[:login_attribute] instance_eval(&self.class.login_model_scope).login(login_attribute => login_attribute_value, :password => password) lib/controller.rb 7acc23556fa7b2a911164cfd2d4bc5f9583fc2fc Joshua Clayton jclayton@fusionary.com http://github.com/mvanholstyn/mhs_authentication_system/commit/c5d55ed530a6e72b3351cdd5fa16ea8614275d7c c5d55ed530a6e72b3351cdd5fa16ea8614275d7c 2009-03-29T20:11:11-07:00 2009-03-23T20:08:16-07:00 Reverse order to check options before seeing if it's basic auth Signed-off-by: Mark Van Holstyn <mvanholstyn@gmail.com> cfb22501a41974cb2a75a476f5fcbc07ef4e9079 Mark Van Holstyn mvanholstyn@gmail.com