From: <mako@atdot.cc>
Date: Sat, 27 Dec 2008 12:55:15 +0000 (-0500)
Subject: merged more fixes from devel
X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/fdf4d7a7c42462ffad099a04523d1494abcd226b?hp=a48ffbac5ce1517a369ef84426bfe44d6ebad7cb

merged more fixes from devel
---

diff --git a/app/models/token.rb b/app/models/token.rb
index c2d3667..8bfecc4 100644
--- 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