Changeset 12863

Timestamp:

01/27/2010 01:27:25 AM (15 years ago)

Author:

wpmuguru

Message:

deprecate validate_email(), fixes #11745

Location:

trunk/wp-includes

Files:

• ms-deprecated.php (modified) (1 diff)
• ms-functions.php (modified) (2 diffs)

trunk/wp-includes/ms-deprecated.php

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

trunk/wp-includes/ms-functions.php

@@ -900 +900 @@
 }
 
-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" );
@@ -982 +965 @@
     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' );