merged more fixes from devel

diff --git a/app/models/token.rb b/app/models/token.rb
index c2d3667a9027a5a29da5628e04b9c73c0a6426d8..8bfecc40770854a111c3b3b10091e7f35cd85e9b 100644 (file)
--- a/app/models/token.rb
+++ b/app/models/token.rb
@@ -23,7 +23,8 @@ class Token < ActiveRecord::Base
     super
 
     token_generator = UniqueTokenGenerator.new( 16 )
-    until not token.empty? and Token.find(:all, :conditions => [ "token = ?", token ]).empty? and token[0..3] != "open"
+    until token and not token.empty? \
+      and Token.find(:all, :conditions => [ "token = ?", token ]).empty? and token[0..3] != "open"
       self.token = token_generator.token
     end