forgot to return on invalid nickname

darcs-hash:20080622181550-34904-7970919db30ccfc3979fa6c118c29af9eac0c550.gz
This commit is contained in:
Evan Prodromou 2008-06-22 14:15:50 -04:00
parent d758c11784
commit 1899d09cd1
2 changed files with 3 additions and 2 deletions

View File

@ -342,8 +342,8 @@ class FinishopenidloginAction extends Action {
'max_length' => 64, 'max_length' => 64,
'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) { 'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
return false; return false;
} }
if (!User::allowed_nickname($str)) { if (!User::allowed_nickname($str)) {
return false; return false;
} }
if (User::staticGet('nickname', $str)) { if (User::staticGet('nickname', $str)) {

View File

@ -90,6 +90,7 @@ class ProfilesettingsAction extends SettingsAction {
return; return;
} else if (!User::allowed_nickname($nickname)) { } else if (!User::allowed_nickname($nickname)) {
$this->show_form(_t('Not a valid nickname.')); $this->show_form(_t('Not a valid nickname.'));
return;
} else if (!is_null($homepage) && (strlen($homepage) > 0) && } else if (!is_null($homepage) && (strlen($homepage) > 0) &&
!Validate::uri($homepage, array('allowed_schemes' => array('http', 'https')))) { !Validate::uri($homepage, array('allowed_schemes' => array('http', 'https')))) {
$this->show_form(_t('Homepage is not a valid URL.')); $this->show_form(_t('Homepage is not a valid URL.'));