Merge branch '0.8.x' into 0.9.x

[quix0rs-gnu-social.git] / actions / profilesettings.php

diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 961e15ae7d36e504ed29abda904e430d2b254185..f429a2e516479fe4bf90a9c8e74f6965660d0c88 100644 (file)
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -196,7 +196,7 @@ class ProfilesettingsAction extends AccountSettingsAction
             // Some validation
             if (!Validate::string($nickname, array('min_length' => 1,
                             'max_length' => 64,
-                            'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
+                            'format' => NICKNAME_FMT))) {
                 $this->showForm(_('Nickname must have only lowercase letters and numbers and no spaces.'));
                 return;
             } else if (!User::allowed_nickname($nickname)) {