Fix dumb mistake -- changed function names partway through writing Nickname and forgo...

diff --git a/lib/common.php b/lib/common.php
index d891807185fa24de3d8e0c3ece6f1ed5c45335f8..cf4d6e1e70ff6863b9c6c43e0e8f4070855c14c9 100644 (file)
--- 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 48269f3b9f5f4de08d81e461f8885ef3103635bd..a0c9378cd3add545ecde82f63425b323652fb99e 100644 (file)
--- 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 86dd1c669b95ed30a4334d52c49ca588307e849e..b95321cabaf0ad23feb40dd4c2296cc6bd6846ff 100644 (file)
--- 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;