<!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>[13422] trunk/wp-includes/class-http.php: Clean up redundant defined()
check.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13422">13422</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-26 00:37:20 +0000 (Fri, 26 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up redundant defined() check. Props TobiasBg fixes <a href="http://trac.wordpress.org/ticket/12375">#12375</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasshttpphp">trunk/wp-includes/class-http.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasshttpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-http.php (13421 => 13422)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-http.php 2010-02-26 00:05:11 UTC (rev 13421)
+++ trunk/wp-includes/class-http.php 2010-02-26 00:37:20 UTC (rev 13422)
</span><span class="lines">@@ -538,8 +538,8 @@
</span><span class="cx"> * Those who are behind a proxy and want to prevent access to certain hosts may do so. This will
</span><span class="cx"> * prevent plugins from working and core functionality, if you don't include api.wordpress.org.
</span><span class="cx"> *
</span><del>- * You block external URL requests by defining WP_HTTP_BLOCK_EXTERNAL in your wp-config.php file
- * and this will only allow localhost and your blog to make requests. The constant
</del><ins>+ * You block external URL requests by defining WP_HTTP_BLOCK_EXTERNAL as true in your wp-config.php
+ * file and this will only allow localhost and your blog to make requests. The constant
</ins><span class="cx"> * WP_ACCESSIBLE_HOSTS will allow additional hosts to go through for requests. The format of the
</span><span class="cx"> * WP_ACCESSIBLE_HOSTS constant is a comma separated list of hostnames to allow.
</span><span class="cx"> *
</span><span class="lines">@@ -551,7 +551,7 @@
</span><span class="cx"> */
</span><span class="cx"> function block_request($uri) {
</span><span class="cx"> // We don't need to block requests, because nothing is blocked.
</span><del>- if ( ! defined('WP_HTTP_BLOCK_EXTERNAL') || ( defined('WP_HTTP_BLOCK_EXTERNAL') && WP_HTTP_BLOCK_EXTERNAL == false ) )
</del><ins>+ if ( ! defined( 'WP_HTTP_BLOCK_EXTERNAL' ) || ! WP_HTTP_BLOCK_EXTERNAL )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // parse_url() only handles http, https type URLs, and will emit E_WARNING on failure.
</span></span></pre>
</div>
</div>
</body>
</html>