diff options
author | Evan Prodromou <evan@controlezvous.ca> | 2008-06-22 12:54:53 -0400 |
---|---|---|
committer | Evan Prodromou <evan@controlezvous.ca> | 2008-06-22 12:54:53 -0400 |
commit | b4d8bbdad7b3a9f04ea93800924b37a9b256facc (patch) | |
tree | afc32631812421bc5ef52e01493728ca1fd4c74c /actions/profilesettings.php | |
parent | 29014487d7651cee272794fe771ee467121ecea6 (diff) |
allow blank email address (I think)0.3.4
darcs-hash:20080622165453-34904-a3bdd2557622e6db3aef88371c22586e2d2fed07.gz
Diffstat (limited to 'actions/profilesettings.php')
-rw-r--r-- | actions/profilesettings.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actions/profilesettings.php b/actions/profilesettings.php index 85e7bd19f..6764ad288 100644 --- a/actions/profilesettings.php +++ b/actions/profilesettings.php @@ -80,7 +80,7 @@ class ProfilesettingsAction extends SettingsAction { # Some validation - if (!Validate::email($email, true)) { + if (!is_null($email) && !Validate::email($email, true)) { $this->show_form(_t('Not a valid email address.')); return; } else if (!Validate::string($nickname, array('min_length' => 1, @@ -113,7 +113,7 @@ class ProfilesettingsAction extends SettingsAction { $user->query('BEGIN'); - if (strcmp($user->nickname, $nickname) != 0) { + if ($user->nickname != $nickname) { common_debug('Updating user nickname from ' . $user->nickname . ' to ' . $nickname, __FILE__); @@ -131,7 +131,7 @@ class ProfilesettingsAction extends SettingsAction { } } - if (strcmp($user->email, $email) != 0) { + if ($user->email != $email) { common_debug('Updating user email from ' . $user->email . ' to ' . $email, __FILE__); |