diff options
| author | Evan Prodromou <evan@status.net> | 2009-10-28 14:21:51 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-10-28 14:21:51 -0400 |
| commit | 6c615f6801540d8b28cdc6d4ecf817943c11db34 (patch) | |
| tree | 86967dd32fcbad904cd06b866b2f7cd0e748343e /plugins/OpenID | |
| parent | 7df082abb8f9570e55bac209068146e34b3781b4 (diff) | |
| parent | bf701b8235c22e648e44adfed8a9cb8e30cf9eab (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins/OpenID')
| -rw-r--r-- | plugins/OpenID/finishopenidlogin.php | 2 | ||||
| -rw-r--r-- | plugins/OpenID/openid.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/OpenID/finishopenidlogin.php b/plugins/OpenID/finishopenidlogin.php index 50a9c15c8..ff0b451d3 100644 --- a/plugins/OpenID/finishopenidlogin.php +++ b/plugins/OpenID/finishopenidlogin.php @@ -265,7 +265,7 @@ class FinishopenidloginAction extends Action $fullname = ''; } - if (!empty($sreg['email']) && Validate::email($sreg['email'], true)) { + if (!empty($sreg['email']) && Validate::email($sreg['email'], common_config('email', 'check_domain'))) { $email = $sreg['email']; } else { $email = ''; diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php index 0944117c0..b76497c28 100644 --- a/plugins/OpenID/openid.php +++ b/plugins/OpenID/openid.php @@ -241,7 +241,7 @@ function oid_update_user(&$user, &$sreg) $orig_user = clone($user); - if ($sreg['email'] && Validate::email($sreg['email'], true)) { + if ($sreg['email'] && Validate::email($sreg['email'], common_config('email', 'check_domain'))) { $user->email = $sreg['email']; } |