Merge trunk

[selectricity] / app / models / full_voter.rb

diff --git a/app/models/full_voter.rb b/app/models/full_voter.rb
index 04071a0f398555adaf1bd10b4b0a6cf25ecc243b..980fb5cf3c0fdeef0c043be9aeabe33233f6a874 100644 (file)
--- a/app/models/full_voter.rb
+++ b/app/models/full_voter.rb
@@ -5,7 +5,7 @@ class FullVoter < Voter
   def create_password
     token_generator = UniqueTokenGenerator.new( 16 )
     until password and not password.empty? \
-          and Voter.find_all( [ "password = ?", password ]).empty?
+          and Voter.find(:all, :conditions => [ "password = ?", password ]).empty?
       self.password = token_generator.token
     end
   end