Fixes bug in merb-auth caught by step-by-step tester

merb · Dec 29, 2008 · 30d90d3 · 30d90d3
1 parent bd45664
commit 30d90d3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/merb-auth/merb-auth-more/lib/merb-auth-more/strategies/basic/password_form.rb b/merb-auth/merb-auth-more/lib/merb-auth-more/strategies/basic/password_form.rb
@@ -16,12 +16,12 @@ module Basic
       class Form < Base
 
         def run!
-          if login = request.params[login_param] && password = request.params[password_param]
+          if (login = request.params[login_param]) && (password = request.params[password_param])
             user = user_class.authenticate(login, password)
             if !user
               errors = request.session.authentication.errors
               errors.clear!
-              error.add(login_param, strategy_error_message)
+              errors.add(login_param, strategy_error_message)
             end
             user
           end

diff --git a/merb-core/lib/merb-core/version.rb b/merb-core/lib/merb-core/version.rb
@@ -1,4 +1,4 @@
 module Merb
-  VERSION = '1.0.6.1' unless defined?(Merb::VERSION)
+  VERSION = '1.0.7' unless defined?(Merb::VERSION)
   DM_VERSION = '0.9.8' unless defined?(Merb::DM_VERSION)
 end