summaryrefslogtreecommitdiff
path: root/actions/register.php
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2009-10-27 15:00:35 +0100
committerSarven Capadisli <csarven@status.net>2009-10-27 15:00:35 +0100
commitac47015e2b9b4a82ef497d203fb971b7f128ad41 (patch)
treec9bb929b2062f4437bafea1830a8af08d877015f /actions/register.php
parent0e029d728429009e7791ae052df4e9998e309fab (diff)
parent0b4390e7f2322a15f16919425de039d555b3e516 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/register.php')
-rw-r--r--actions/register.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/register.php b/actions/register.php
index 100ab7424..a6c1a903a 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -191,7 +191,7 @@ class RegisterAction extends Action
if (!$this->boolean('license')) {
$this->showForm(_('You can\'t register if you don\'t '.
'agree to the license.'));
- } else if ($email && !Validate::email($email, true)) {
+ } else if ($email && !Validate::email($email, common_config('email', 'check_domain'))) {
$this->showForm(_('Not a valid email address.'));
} else if (!Validate::string($nickname, array('min_length' => 1,
'max_length' => 64,