Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Martin Konecny 2012-08-30 14:37:08 -04:00
commit 010ba63d59
1 changed files with 3 additions and 0 deletions

View File

@ -45,6 +45,9 @@ class UserController extends Zend_Controller_Action
$user->setFirstName($formdata['first_name']);
$user->setLastName($formdata['last_name']);
$user->setLogin($formdata['login']);
// We don't allow 6 x's as passwords are not allowed.
// The reason is because we that as a password placeholder
// on the client side.
if ($formdata['password'] != "xxxxxx")
$user->setPassword($formdata['password']);
$user->setType($formdata['type']);