summaryrefslogtreecommitdiff
path: root/modules/user/models
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2009-11-21 18:57:44 -0800
committerTim Almdal <tnalmdal@shaw.ca>2009-11-21 18:57:44 -0800
commitf8a4c6edaa405494139aaf8eb6579a9488e73034 (patch)
tree098263faec67d468c70cf74f70a3f7136e55a2a2 /modules/user/models
parent23a60fb1f217475419c55adc7ce7427fcdadb2c3 (diff)
parent38233c67a2946d6fe7b6457217541c796247285d (diff)
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'modules/user/models')
-rw-r--r--modules/user/models/user.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/user/models/user.php b/modules/user/models/user.php
index 184ce70a..bd61def8 100644
--- a/modules/user/models/user.php
+++ b/modules/user/models/user.php
@@ -23,7 +23,7 @@ class User_Model extends ORM implements User_Definition {
var $rules = array(
"name" => "required|length[1,32]",
"full_name" => "length[0,255]",
- "email" => "valid_email|length[1,255]",
+ "email" => "required|valid_email|length[1,255]",
"password" => "length[1,40]",
"url" => "valid_url",
"locale" => "length[2,10]");