summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlezvous.ca>2008-06-22 14:15:50 -0400
committerEvan Prodromou <evan@controlezvous.ca>2008-06-22 14:15:50 -0400
commit1899d09cd11676d375814e6c80107d93748656a7 (patch)
treee1c8f3509b0c6b028c8c63282ecf1519f8ce57fc /actions
parentd758c117843dec04b061263095baeea7697b05a4 (diff)
forgot to return on invalid nickname
darcs-hash:20080622181550-34904-7970919db30ccfc3979fa6c118c29af9eac0c550.gz
Diffstat (limited to 'actions')
-rw-r--r--actions/finishopenidlogin.php4
-rw-r--r--actions/profilesettings.php1
2 files changed, 3 insertions, 2 deletions
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.'));