diff options
| author | Evan Prodromou <evan@controlezvous.ca> | 2008-06-23 21:46:42 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlezvous.ca> | 2008-06-23 21:46:42 -0400 |
| commit | 960a092a9ca4cb40f209b4c8583fbb129ff84087 (patch) | |
| tree | 62d15227338e9737de36c1403920c63feb296cea | |
| parent | c2c7bf827234afccd4e24a788376ea364dc7de77 (diff) | |
don't validate email if none provided
darcs-hash:20080624014642-34904-7d4b1b91a3163add6a99146f92360913e172a39a.gz
| -rw-r--r-- | actions/profilesettings.php | 4 | ||||
| -rw-r--r-- | actions/register.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actions/profilesettings.php b/actions/profilesettings.php index e98c84935..44243f310 100644 --- a/actions/profilesettings.php +++ b/actions/profilesettings.php @@ -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; } } -}
\ No newline at end of file +} diff --git a/actions/register.php b/actions/register.php index 16e80ef17..95e684c1b 100644 --- a/actions/register.php +++ b/actions/register.php @@ -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, |