Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

deprecate validate_email(), fixes #11745 

git-svn-id: http://svn.automattic.com/wordpress/trunk@12863 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
wpmuguru 2010-01-27 01:27:25 +00:00
parent 301dc6dbf0
commit ecda3f2745
2 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/ms-deprecated.php
View File

@ -125,4 +125,11 @@ function is_main_blog() {
return is_main_site();
}
?>
/**
* @deprecated 3.0
*/
function validate_email( $email, $check_domain = true) {
return is_email( $email, $check_domain );
}
?>

20
wp-includes/ms-functions.php
View File

@ -899,23 +899,6 @@ function is_blog_user( $blog_id = 0 ) {
return false;
}
function validate_email( $email, $check_domain = true) {
if (ereg('^[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+'.'@'.
'[-!#$%&\'*+\\/0-9=?A-Z^_`a-z{|}~]+\.'.
'[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+$', $email))
{
if ($check_domain && function_exists('checkdnsrr')) {
list (, $domain) = explode('@', $email);
if (checkdnsrr($domain.'.', 'MX') || checkdnsrr($domain.'.', 'A'))
return true;
return false;
}
return true;
}
return false;
}
function is_email_address_unsafe( $user_email ) {
$banned_names = get_site_option( "banned_email_domains" );
if ($banned_names && !is_array( $banned_names ))
@ -982,9 +965,6 @@ function wpmu_validate_user_signup($user_name, $user_email) {
if ( !is_email( $user_email ) )
$errors->add('user_email', __("Please enter a correct email address"));
if ( !validate_email( $user_email ) )
$errors->add('user_email', __("Please check your email address."));
$limited_email_domains = get_site_option( 'limited_email_domains' );
if ( is_array( $limited_email_domains ) && empty( $limited_email_domains ) == false ) {
$emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) );