<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12863] trunk/wp-includes: deprecate validate_email(), fixes #11745</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12863">12863</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-01-27 01:27:25 +0000 (Wed, 27 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>deprecate validate_email(), fixes <a href="http://trac.wordpress.org/ticket/11745">#11745</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmsdeprecatedphp">trunk/wp-includes/ms-deprecated.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmsdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-deprecated.php (12862 => 12863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-deprecated.php 2010-01-27 00:20:10 UTC (rev 12862)
+++ trunk/wp-includes/ms-deprecated.php 2010-01-27 01:27:25 UTC (rev 12863)
</span><span class="lines">@@ -125,4 +125,11 @@
</span><span class="cx"> return is_main_site();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+/**
+ * @deprecated 3.0
+ */
+function validate_email( $email, $check_domain = true) {
+ return is_email( $email, $check_domain );
+}
+
+?>
</ins></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (12862 => 12863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-01-27 00:20:10 UTC (rev 12862)
+++ trunk/wp-includes/ms-functions.php 2010-01-27 01:27:25 UTC (rev 12863)
</span><span class="lines">@@ -899,23 +899,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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;
-}
-
</del><span class="cx"> function is_email_address_unsafe( $user_email ) {
</span><span class="cx"> $banned_names = get_site_option( "banned_email_domains" );
</span><span class="cx"> if ($banned_names && !is_array( $banned_names ))
</span><span class="lines">@@ -982,9 +965,6 @@
</span><span class="cx"> if ( !is_email( $user_email ) )
</span><span class="cx"> $errors->add('user_email', __("Please enter a correct email address"));
</span><span class="cx">
</span><del>- if ( !validate_email( $user_email ) )
- $errors->add('user_email', __("Please check your email address."));
-
</del><span class="cx"> $limited_email_domains = get_site_option( 'limited_email_domains' );
</span><span class="cx"> if ( is_array( $limited_email_domains ) && empty( $limited_email_domains ) == false ) {
</span><span class="cx"> $emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) );
</span></span></pre>
</div>
</div>
</body>
</html>