]> projects.mako.cc - selectricity-live/blobdiff - app/models/user.rb
Fix full voter addition bug where the regex flunks the trailing \r on middle items...
[selectricity-live] / app / models / user.rb
index eca592dee17ef7082a09e21b6db191d38c8341f3..728ca164eee7fa87868f6fdb5fe1ba749440bcf5 100644 (file)
@@ -72,7 +72,7 @@ class User < ActiveRecord::Base
       # Stolen from http://www.regular-expressions.info/email.html
       errors.add(:email, "is not valid") unless email  =~
                   /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i
-      errors.add(:login, "should not begin or end with spaces") if login.strip!
+      errors.add(:login, "should not begin or end with spaces") if login and login.strip!
       errors.add(:login, "should contain only letters, numbers, and spaces") unless login =~ /^[A-Za-z0-9 ]*$/
     end
 end

Benjamin Mako Hill || Want to submit a patch?