diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-07-06 10:58:31 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-07-06 10:58:31 +0000 |
| commit | 8af523c69462c794cf15ef539e3c52df971e3afe (patch) | |
| tree | c3fcc0370ac0695f002399a15bbb8a5f6c033eb9 | |
| parent | 2f845062275bbae1d863fe6759050f706c83f089 (diff) | |
| download | redmine-8af523c69462c794cf15ef539e3c52df971e3afe.tar.gz redmine-8af523c69462c794cf15ef539e3c52df971e3afe.zip | |
Merged r1561 from trunk.
git-svn-id: http://redmine.rubyforge.org/svn/branches/0.7-stable@1629 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |