Merge branch 'master' of git://github.com/technoweenie/restful-authen…

…tication
hiphapis · Feb 20, 2009 · aee09f8 · aee09f8
2 parents e0a96da + 4834fb7
commit aee09f8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/generators/authenticated/templates/model.rb b/generators/authenticated/templates/model.rb
@@ -55,9 +55,9 @@ def active?
   #
   def self.authenticate(login, password)
     return nil if login.blank? || password.blank?
-    u = <% if    options[:stateful]           %>find_in_state :first, :active, :conditions => {:login => login}<%
+    u = <% if    options[:stateful]           %>find_in_state :first, :active, :conditions => {:login => login.downcase}<%
            elsif options[:include_activation] %>find :first, :conditions => ['login = ? and activated_at IS NOT NULL', login]<%
-           else %>find_by_login(login)<% end %> # need to get the salt
+           else %>find_by_login(login.downcase)<% end %> # need to get the salt
     u && u.authenticated?(password) ? u : nil
   end