forgot to return on invalid nickname

darcs-hash:20080622181550-34904-7970919db30ccfc3979fa6c118c29af9eac0c550.gz

diff --git a/actions/finishopenidlogin.php b/actions/finishopenidlogin.php
index fe9894e52b0a5cbee7f1a90c576d1801ab95091d..02d8fff9814a88fd0006fec53bdf844ad666d439 100644 (file)
--- 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 b6e24c729976cdc638915023bf728e72a21853a5..e98c84935116ea2709d20fb719fc9f7cbea8d5ce 100644 (file)
--- 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.'));