From 789203a3e32da2b70723fa21a96eb7c99e24c783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Je=CC=81ro=CC=82me=20Schneider?= Date: Mon, 19 Nov 2012 14:01:14 +0100 Subject: [PATCH] Username may now be an email address. --- Core/Frameworks/Baikal/Model/User.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/Frameworks/Baikal/Model/User.php b/Core/Frameworks/Baikal/Model/User.php index 223012b..9bcdd62 100755 --- a/Core/Frameworks/Baikal/Model/User.php +++ b/Core/Frameworks/Baikal/Model/User.php @@ -204,7 +204,7 @@ class User extends \Flake\Core\Model\Db { $oMorpho->add(new \Formal\Element\Text(array( "prop" => "username", "label" => "Username", - "validation" => "required,tokenid,unique", + "validation" => "required,unique", "popover" => array( "title" => "Username", "content" => "The login for this user account.
It has to be unique.", @@ -239,7 +239,7 @@ class User extends \Flake\Core\Model\Db { ))); if($this->floating()) { - $oMorpho->element("username")->setOption("help", "Allowed characters are digits, lowercase letters and the dash symbol '-'."); + $oMorpho->element("username")->setOption("help", "May be an email, but not forcibly."); $oMorpho->element("password")->setOption("validation", "required"); } else { $sNotice = "-- Leave empty to keep current password --";