<!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>[14116] trunk/wp-includes/functions.php:
Some sanity checks for parse_url in do_enclose.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14116">14116</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-04-16 19:48:30 +0000 (Fri, 16 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Some sanity checks for parse_url in do_enclose. props miqrogroove, fixes <a href="http://trac.wordpress.org/ticket/11029">#11029</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (14115 => 14116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-04-16 19:07:00 UTC (rev 14115)
+++ trunk/wp-includes/functions.php 2010-04-16 19:48:30 UTC (rev 14116)
</span><span class="lines">@@ -1197,7 +1197,9 @@
</span><span class="cx">
</span><span class="cx"> foreach ( (array) $post_links_temp[0] as $link_test ) {
</span><span class="cx"> if ( !in_array( $link_test, $pung ) ) { // If we haven't pung it already
</span><del>- $test = parse_url( $link_test );
</del><ins>+ $test = @parse_url( $link_test );
+ if ( false === $test )
+ continue;
</ins><span class="cx"> if ( isset( $test['query'] ) )
</span><span class="cx"> $post_links[] = $link_test;
</span><span class="cx"> elseif ( $test['path'] != '/' && $test['path'] != '' )
</span><span class="lines">@@ -1215,13 +1217,15 @@
</span><span class="cx">
</span><span class="cx"> // Check to see if we can figure out the mime type from
</span><span class="cx"> // the extension
</span><del>- $url_parts = parse_url( $url );
- $extension = pathinfo( $url_parts['path'], PATHINFO_EXTENSION );
- if ( !empty( $extension ) ) {
- foreach ( get_allowed_mime_types( ) as $exts => $mime ) {
- if ( preg_match( '!^(' . $exts . ')$!i', $extension ) ) {
- $type = $mime;
- break;
</del><ins>+ $url_parts = @parse_url( $url );
+ if ( false !== $url_parts ) {
+ $extension = pathinfo( $url_parts['path'], PATHINFO_EXTENSION );
+ if ( !empty( $extension ) ) {
+ foreach ( get_allowed_mime_types( ) as $exts => $mime ) {
+ if ( preg_match( '!^(' . $exts . ')$!i', $extension ) ) {
+ $type = $mime;
+ break;
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>