From a6898b033d0b38931c826b8ff9246d01e1bf63a8 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Thu, 28 Jan 2016 19:11:43 +0100 Subject: [PATCH] Fullname and location are now text, not varchar, and can be >191|255 --- actions/apiaccountregister.php | 8 +------- actions/register.php | 6 ------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/actions/apiaccountregister.php b/actions/apiaccountregister.php index 2f3129001c..4a78599829 100644 --- a/actions/apiaccountregister.php +++ b/actions/apiaccountregister.php @@ -131,9 +131,6 @@ class ApiAccountRegisterAction extends ApiAction !common_valid_http_url($homepage)) { // TRANS: Form validation error displayed when trying to register with an invalid homepage URL. $this->clientError(_('Homepage is not a valid URL.'), 400); - } else if (!is_null($fullname) && mb_strlen($fullname) > 255) { - // TRANS: Form validation error displayed when trying to register with a too long full name. - $this->clientError(_('Full name is too long (maximum 255 characters).'), 400); } else if (Profile::bioTooLong($bio)) { // TRANS: Form validation error on registration page when providing too long a bio text. // TRANS: %d is the maximum number of characters for bio; used for plural. @@ -141,9 +138,6 @@ class ApiAccountRegisterAction extends ApiAction 'Bio is too long (maximum %d characters).', Profile::maxBio()), Profile::maxBio()), 400); - } else if (!is_null($location) && mb_strlen($location) > 255) { - // TRANS: Form validation error displayed when trying to register with a too long location. - $this->clientError(_('Location is too long (maximum 255 characters).'), 400); } else if (strlen($password) < 6) { // TRANS: Form validation error displayed when trying to register with too short a password. $this->clientError(_('Password must be 6 or more characters.'), 400); @@ -197,4 +191,4 @@ class ApiAccountRegisterAction extends ApiAction return is_object($user); } -} \ No newline at end of file +} diff --git a/actions/register.php b/actions/register.php index 7ab04534f6..15b6b23cab 100644 --- a/actions/register.php +++ b/actions/register.php @@ -208,9 +208,6 @@ class RegisterAction extends Action !common_valid_http_url($homepage)) { // TRANS: Form validation error displayed when trying to register with an invalid homepage URL. $this->showForm(_('Homepage is not a valid URL.')); - } else if (!is_null($fullname) && mb_strlen($fullname) > 255) { - // TRANS: Form validation error displayed when trying to register with a too long full name. - $this->showForm(_('Full name is too long (maximum 255 characters).')); } else if (Profile::bioTooLong($bio)) { // TRANS: Form validation error on registration page when providing too long a bio text. // TRANS: %d is the maximum number of characters for bio; used for plural. @@ -218,9 +215,6 @@ class RegisterAction extends Action 'Bio is too long (maximum %d characters).', Profile::maxBio()), Profile::maxBio())); - } else if (!is_null($location) && mb_strlen($location) > 255) { - // TRANS: Form validation error displayed when trying to register with a too long location. - $this->showForm(_('Location is too long (maximum 255 characters).')); } else if (strlen($password) < 6) { // TRANS: Form validation error displayed when trying to register with too short a password. $this->showForm(_('Password must be 6 or more characters.')); -- 2.39.5