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

don't validate email if none provided

Browse Source 
darcs-hash:20080624014642-34904-7d4b1b91a3163add6a99146f92360913e172a39a.gz
This commit is contained in:
Evan Prodromou 2008-06-23 21:46:42 -04:00
parent c2c7bf8272
commit 960a092a9c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actions/profilesettings.php
View File

@ -80,7 +80,7 @@ class ProfilesettingsAction extends SettingsAction {
# Some validation
if (!is_null($email) && !Validate::email($email, true)) {
if ($email && !Validate::email($email, true)) {
$this->show_form(_t('Not a valid email address.'));
return;
} else if (!Validate::string($nickname, array('min_length' => 1,
@ -211,4 +211,4 @@ class ProfilesettingsAction extends SettingsAction {
return $other->id != $user->id;
}
}
}
}

2
actions/register.php
View File

@ -49,7 +49,7 @@ class RegisterAction extends Action {
if (!$this->boolean('license')) {
$this->show_form(_t('You can\'t register if you don\'t agree to the license.'));
} else if (!Validate::email($email, true)) {
} else if ($email && !Validate::email($email, true)) {
$this->show_form(_t('Not a valid email address.'));
} else if (!Validate::string($nickname, array('min_length' => 1,
'max_length' => 64,