Big commit includes:

[selectricity-live] / app / models / token.rb

diff --git a/app/models/token.rb b/app/models/token.rb
index 2bab51314f0df581cd22684811fe0360d8025918..4ed9598f15cddc4888a4c32612269ad3f0f124d2 100644 (file)
--- a/app/models/token.rb
+++ b/app/models/token.rb
@@ -5,7 +5,7 @@ class Token < ActiveRecord::Base
     super
 
     token_generator = UniqueTokenGenerator.new( 16 )
     super
 
     token_generator = UniqueTokenGenerator.new( 16 )

-    until not token.empty? and Token.find_all( [ "token = ?", token ]).empty?
+    until not token.empty? and Token.find(:all, :conditions => [ "token = ?", token ]).empty?

       self.token = token_generator.token
     end
 
       self.token = token_generator.token
     end