GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Fix dumb mistake -- changed function names partway through writing Nickname and forgot to update a couple places. :)

Browse Source
This commit is contained in:
Brion Vibber 2010-12-01 11:21:00 -08:00
parent 0410462c4b
commit f68d4e7d06
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/common.php
View File

@ -124,7 +124,7 @@ require_once 'markdown.php';
* note that it includes the [] and repeating bits, so should be wrapped * note that it includes the [] and repeating bits, so should be wrapped
* directly in a capture paren usually. * directly in a capture paren usually.
* *
* For validation, use Nickname::validate() etc. * For validation, use Nickname::normalize(), Nickname::isValid() etc.
* *
* @deprecated * @deprecated
*/ */

4
lib/nickname.php
View File

@ -23,7 +23,7 @@ class Nickname
* Regex fragment for pulling an arbitrarily-formated nickname. * Regex fragment for pulling an arbitrarily-formated nickname.
* *
* Not guaranteed to be valid after normalization; run the string through * 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. * if you just need to check if it's properly formatted.
* *
* This and CANONICAL_FMT replace the old NICKNAME_FMT, but be aware * This and CANONICAL_FMT replace the old NICKNAME_FMT, but be aware
@ -61,7 +61,7 @@ class Nickname
* @param string $str * @param string $str
* @return boolean * @return boolean
*/ */
public static function validate($str) public static function isValid($str)
{ {
try { try {
self::normalize($str); self::normalize($str);

2
plugins/OpenID/finishopenidlogin.php
View File

@ -273,7 +273,7 @@ class FinishopenidloginAction extends Action
} }
try { try {
$nickname = Nickname::validate($this->trimmed('newname')); $nickname = Nickname::normalize($this->trimmed('newname'));
} catch (NicknameException $e) { } catch (NicknameException $e) {
$this->showForm($e->getMessage()); $this->showForm($e->getMessage());
return; return;