API 0.4 Updates - work on traces pages + pagination, edit tab, some API testing

[rails.git] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index c0468f8b075f6cbae5ed43209f91738a027268fe..4c7a26473712f9ad29691e9394637e6b2e89445a 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -24,12 +24,12 @@ class User < ActiveRecord::Base
     write_attribute("pass_crypt_confirm", Digest::MD5.hexdigest(str)) 
   end 
 
-  def self.authenticate(email, passwd) 
-    find_first([ "email = ? AND pass_crypt =?", email, Digest::MD5.hexdigest(passwd) ])
+  def self.authenticate(email, passwd) \r
+    find(:first, :conditions => [ "email = ? AND pass_crypt = ?", email, Digest::MD5.hexdigest(passwd)])\r
   end 
 
   def self.authenticate_token(token) 
-    find_first([ "token = ? ", token])
+    find(:first, :conditions => [ "token = ? ", token])
   end 
   
   def self.make_token(length=30)