From 1899d09cd11676d375814e6c80107d93748656a7 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sun, 22 Jun 2008 14:15:50 -0400 Subject: forgot to return on invalid nickname darcs-hash:20080622181550-34904-7970919db30ccfc3979fa6c118c29af9eac0c550.gz --- actions/finishopenidlogin.php | 4 ++-- actions/profilesettings.php | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'actions') diff --git a/actions/finishopenidlogin.php b/actions/finishopenidlogin.php index fe9894e52..02d8fff98 100644 --- a/actions/finishopenidlogin.php +++ b/actions/finishopenidlogin.php @@ -342,8 +342,8 @@ class FinishopenidloginAction extends Action { 'max_length' => 64, 'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) { return false; - } - if (!User::allowed_nickname($str)) { + } + if (!User::allowed_nickname($str)) { return false; } if (User::staticGet('nickname', $str)) { diff --git a/actions/profilesettings.php b/actions/profilesettings.php index b6e24c729..e98c84935 100644 --- a/actions/profilesettings.php +++ b/actions/profilesettings.php @@ -90,6 +90,7 @@ class ProfilesettingsAction extends SettingsAction { return; } else if (!User::allowed_nickname($nickname)) { $this->show_form(_t('Not a valid nickname.')); + return; } else if (!is_null($homepage) && (strlen($homepage) > 0) && !Validate::uri($homepage, array('allowed_schemes' => array('http', 'https')))) { $this->show_form(_t('Homepage is not a valid URL.')); -- cgit v1.2.3-54-g00ecf