diff options
| -rw-r--r-- | lib/common.php | 2 | ||||
| -rw-r--r-- | lib/nickname.php | 4 | ||||
| -rw-r--r-- | plugins/OpenID/finishopenidlogin.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/common.php b/lib/common.php index d89180718..cf4d6e1e7 100644 --- a/lib/common.php +++ b/lib/common.php @@ -124,7 +124,7 @@ require_once 'markdown.php'; * note that it includes the [] and repeating bits, so should be wrapped * directly in a capture paren usually. * - * For validation, use Nickname::validate() etc. + * For validation, use Nickname::normalize(), Nickname::isValid() etc. * * @deprecated */ diff --git a/lib/nickname.php b/lib/nickname.php index 48269f3b9..a0c9378cd 100644 --- a/lib/nickname.php +++ b/lib/nickname.php @@ -23,7 +23,7 @@ class Nickname * Regex fragment for pulling an arbitrarily-formated nickname. * * Not guaranteed to be valid after normalization; run the string through - * Nickname::normalize() to get the canonical form, or Nickname::validate() + * Nickname::normalize() to get the canonical form, or Nickname::isValid() * if you just need to check if it's properly formatted. * * This and CANONICAL_FMT replace the old NICKNAME_FMT, but be aware @@ -61,7 +61,7 @@ class Nickname * @param string $str * @return boolean */ - public static function validate($str) + public static function isValid($str) { try { self::normalize($str); diff --git a/plugins/OpenID/finishopenidlogin.php b/plugins/OpenID/finishopenidlogin.php index 86dd1c669..b95321cab 100644 --- a/plugins/OpenID/finishopenidlogin.php +++ b/plugins/OpenID/finishopenidlogin.php @@ -273,7 +273,7 @@ class FinishopenidloginAction extends Action } try { - $nickname = Nickname::validate($this->trimmed('newname')); + $nickname = Nickname::normalize($this->trimmed('newname')); } catch (NicknameException $e) { $this->showForm($e->getMessage()); return; |