From 8af523c69462c794cf15ef539e3c52df971e3afe Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 6 Jul 2008 10:58:31 +0000 Subject: [PATCH] Merged r1561 from trunk. git-svn-id: http://redmine.rubyforge.org/svn/branches/0.7-stable@1629 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/user.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index 573261b77..5568027d5 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -54,7 +54,7 @@ class User < ActiveRecord::Base # Login must contain lettres, numbers, underscores only validates_format_of :login, :with => /^[a-z0-9_\-@\.]*$/i validates_length_of :login, :maximum => 30 - validates_format_of :firstname, :lastname, :with => /^[\w\s\'\-]*$/i + validates_format_of :firstname, :lastname, :with => /^[\w\s\'\-\.]*$/i validates_length_of :firstname, :lastname, :maximum => 30 validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i, :allow_nil => true validates_length_of :mail, :maximum => 60, :allow_nil => true -- 2.39.5