diff options
author | Brion Vibber <brion@pobox.com> | 2010-11-29 16:47:51 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-11-29 16:47:51 -0800 |
commit | 8161bf079758f5a07549081c24a5e68ec66113b6 (patch) | |
tree | 99973c28b101a294936886ac612d72fef9ba2229 /plugins/FacebookBridge | |
parent | f1f67c2af542aabea4e93d7df0d2e917658e6a83 (diff) | |
parent | 3be352551a979cc3e89e0a2b8f950949b932a304 (diff) |
Merge branch 'namecase' into 0.9.x
Diffstat (limited to 'plugins/FacebookBridge')
-rw-r--r-- | plugins/FacebookBridge/actions/facebookfinishlogin.php | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/plugins/FacebookBridge/actions/facebookfinishlogin.php b/plugins/FacebookBridge/actions/facebookfinishlogin.php index 2174c5ad4..349acd7e2 100644 --- a/plugins/FacebookBridge/actions/facebookfinishlogin.php +++ b/plugins/FacebookBridge/actions/facebookfinishlogin.php @@ -324,12 +324,10 @@ class FacebookfinishloginAction extends Action } } - $nickname = $this->trimmed('newname'); - - if (!Validate::string($nickname, array('min_length' => 1, - 'max_length' => 64, - 'format' => NICKNAME_FMT))) { - $this->showForm(_m('Nickname must have only lowercase letters and numbers and no spaces.')); + try { + $nickname = Nickname::normalize($this->trimmed('newname')); + } catch (NicknameException $e) { + $this->showForm($e->getMessage()); return; } @@ -639,16 +637,7 @@ class FacebookfinishloginAction extends Action */ function isNewNickname($str) { - if ( - !Validate::string( - $str, - array( - 'min_length' => 1, - 'max_length' => 64, - 'format' => NICKNAME_FMT - ) - ) - ) { + if (!Nickname::isValid($str)) { return false; } |