<!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" />
<title>[47617] trunk/src/wp-includes: Code Modernization: Remove error suppression from `parse_url()` calls.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/47617">47617</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/47617","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-04-24 07:26:57 +0000 (Fri, 24 Apr 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Code Modernization: Remove error suppression from `parse_url()` calls.
Previously, the `@` operator was used to prevent possible warnings emitted by `parse_url()` in PHP < 5.3.3 when URL parsing failed.
Now that the minimum version of PHP required by WordPress is 5.6.20, this is no longer needed.
Props netpassprodsr, Howdy_McGee.
Fixes <a href="https://core.trac.wordpress.org/ticket/49980">#49980</a>. See <a href="https://core.trac.wordpress.org/ticket/24780">#24780</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescanonicalphp">trunk/src/wp-includes/canonical.php</a></li>
<li><a href="#trunksrcwpincludesclasshttpphp">trunk/src/wp-includes/class-http.php</a></li>
<li><a href="#trunksrcwpincludesclasswphttpcookiephp">trunk/src/wp-includes/class-wp-http-cookie.php</a></li>
<li><a href="#trunksrcwpincludesclasswphttpproxyphp">trunk/src/wp-includes/class-wp-http-proxy.php</a></li>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>
<li><a href="#trunksrcwpincludesfeedphp">trunk/src/wp-includes/feed.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludeshttpphp">trunk/src/wp-includes/http.php</a></li>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescanonicalphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/canonical.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/canonical.php 2020-04-23 18:56:40 UTC (rev 47616)
+++ trunk/src/wp-includes/canonical.php 2020-04-24 07:26:57 UTC (rev 47617)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +67,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $requested_url .= $_SERVER['REQUEST_URI'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $original = @parse_url( $requested_url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $original = parse_url( $requested_url );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false === $original ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -407,7 +407,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect['query'] = preg_replace( '#^\??&*?#', '', $redirect['query'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $redirect_url && ! empty( $redirect['query'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> parse_str( $redirect['query'], $_parsed_query );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $redirect = @parse_url( $redirect_url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $redirect = parse_url( $redirect_url );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_parsed_query['name'] ) && ! empty( $redirect['query'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> parse_str( $redirect['query'], $_parsed_redirect_query );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -425,11 +425,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $redirect_url ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $redirect = @parse_url( $redirect_url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $redirect = parse_url( $redirect_url );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // www.example.com vs. example.com
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_home = @parse_url( home_url() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_home = parse_url( home_url() );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $user_home['host'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect['host'] = $user_home['host'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -637,7 +637,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The altered query string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _remove_qs_args_if_not_in_url( $query_string, array $args_to_check, $url ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parsed_url = @parse_url( $url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed_url = parse_url( $url );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $parsed_url['query'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> parse_str( $parsed_url['query'], $parsed_query );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $args_to_check as $qv ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -660,7 +660,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The altered URL.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function strip_fragment_from_url( $url ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parsed_url = @parse_url( $url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed_url = parse_url( $url );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $parsed_url['host'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // This mirrors code in redirect_canonical(). It does not handle every case.
</span><span class="cx" style="display: block; padding: 0 10px"> $url = $parsed_url['scheme'] . '://' . $parsed_url['host'];
</span></span></pre></div>
<a id="trunksrcwpincludesclasshttpphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-http.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-http.php 2020-04-23 18:56:40 UTC (rev 47616)
+++ trunk/src/wp-includes/class-http.php 2020-04-24 07:26:57 UTC (rev 47617)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -269,7 +269,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $arrURL = @parse_url( $url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $arrURL = parse_url( $url );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $url ) || empty( $arrURL['scheme'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $response = new WP_Error( 'http_request_failed', __( 'A valid URL was not provided.' ) );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswphttpcookiephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-http-cookie.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-http-cookie.php 2020-04-23 18:56:40 UTC (rev 47616)
+++ trunk/src/wp-includes/class-wp-http-cookie.php 2020-04-24 07:26:57 UTC (rev 47617)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +93,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct( $data, $requested_url = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $requested_url ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $arrURL = @parse_url( $requested_url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $arrURL = parse_url( $requested_url );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $arrURL['host'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->domain = $arrURL['host'];
</span></span></pre></div>
<a id="trunksrcwpincludesclasswphttpproxyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-http-proxy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-http-proxy.php 2020-04-23 18:56:40 UTC (rev 47616)
+++ trunk/src/wp-includes/class-wp-http-proxy.php 2020-04-24 07:26:57 UTC (rev 47617)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,11 +167,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True, to send through the proxy and false if, the proxy should not be used.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function send_through_proxy( $uri ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /*
- * parse_url() only handles http, https type URLs, and will emit E_WARNING on failure.
- * This will be displayed on sites, which is not reasonable.
- */
- $check = @parse_url( $uri );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $check = parse_url( $uri );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Malformed URL, can not process, but this could mean ssl, so let through anyway.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $check ) {
</span></span></pre></div>
<a id="trunksrcwpincludescommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment.php 2020-04-23 18:56:40 UTC (rev 47616)
+++ trunk/src/wp-includes/comment.php 2020-04-24 07:26:57 UTC (rev 47617)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -580,7 +580,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $seconds Comment cookie lifetime. Default 30000000.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_cookie_lifetime = time() + apply_filters( 'comment_cookie_lifetime', 30000000 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $secure = ( 'https' === parse_url( home_url(), PHP_URL_SCHEME ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $secure = ( 'https' === parse_url( home_url(), PHP_URL_SCHEME ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> setcookie( 'comment_author_' . COOKIEHASH, $comment->comment_author, $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure );
</span><span class="cx" style="display: block; padding: 0 10px"> setcookie( 'comment_author_email_' . COOKIEHASH, $comment->comment_author_email, $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure );
</span><span class="cx" style="display: block; padding: 0 10px"> setcookie( 'comment_author_url_' . COOKIEHASH, esc_url( $comment->comment_author_url ), $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2852,9 +2854,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $post_links_temp as $link_test ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If we haven't pung it already and it isn't a link to itself.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $link_test, $pung, true ) && ( url_to_postid( $link_test ) != $post->ID )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Also, let's never ping local attachments.
- && ! is_local_attachment( $link_test ) ) {
- $test = @parse_url( $link_test );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Also, let's never ping local attachments.
+ && ! is_local_attachment( $link_test )
+ ) {
+ $test = parse_url( $link_test );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $test ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $test['query'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_links[] = $link_test;
</span></span></pre></div>
<a id="trunksrcwpincludesfeedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/feed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed.php 2020-04-23 18:56:40 UTC (rev 47616)
+++ trunk/src/wp-includes/feed.php 2020-04-24 07:26:57 UTC (rev 47617)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -622,7 +622,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Correct link for the atom:self element.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_self_link() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $host = @parse_url( home_url() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $host = parse_url( home_url() );
</ins><span class="cx" style="display: block; padding: 0 10px"> return set_url_scheme( 'http://' . $host['host'] . wp_unslash( $_SERVER['REQUEST_URI'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2020-04-23 18:56:40 UTC (rev 47616)
+++ trunk/src/wp-includes/functions.php 2020-04-24 07:26:57 UTC (rev 47617)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -866,7 +866,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $post_links_temp as $link_test ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If we haven't pung it already.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $link_test, $pung, true ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $test = @parse_url( $link_test );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $test = parse_url( $link_test );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false === $test ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -901,7 +901,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_types = array( 'video', 'audio' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check to see if we can figure out the mime type from the extension.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url_parts = @parse_url( $url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url_parts = parse_url( $url );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $url_parts ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $extension = pathinfo( $url_parts['path'], PATHINFO_EXTENSION );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $extension ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1240,7 +1240,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false HTTP content. False on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_remote_fopen( $uri ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parsed_url = @parse_url( $uri );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed_url = parse_url( $uri );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $parsed_url || ! is_array( $parsed_url ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span></span></pre></div>
<a id="trunksrcwpincludeshttpphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/http.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/http.php 2020-04-23 18:56:40 UTC (rev 47616)
+++ trunk/src/wp-includes/http.php 2020-04-24 07:26:57 UTC (rev 47617)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -522,7 +522,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parsed_url = @parse_url( $url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed_url = parse_url( $url );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $parsed_url || empty( $parsed_url['host'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -535,7 +535,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parsed_home = @parse_url( get_option( 'home' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed_home = parse_url( get_option( 'home' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $parsed_home['host'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $same_host = strtolower( $parsed_home['host'] ) === strtolower( $parsed_url['host'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -654,9 +654,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * in the query are being handled inconsistently. This function works around those
</span><span class="cx" style="display: block; padding: 0 10px"> * differences as well.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Error suppression is used as prior to PHP 5.3.3, an E_WARNING would be generated
- * when URL parsing failed.
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.0 The `$component` parameter was added for parity with PHP's `parse_url()`.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -684,7 +681,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = 'placeholder://placeholder' . $url;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parts = @parse_url( $url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parts = parse_url( $url );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $parts ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Parsing failure.
</span></span></pre></div>
<a id="trunksrcwpincludespluggablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pluggable.php 2020-04-23 18:56:40 UTC (rev 47616)
+++ trunk/src/wp-includes/pluggable.php 2020-04-24 07:26:57 UTC (rev 47617)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1423,8 +1423,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $cut = strpos( $location, '?' );
</span><span class="cx" style="display: block; padding: 0 10px"> $test = $cut ? substr( $location, 0, $cut ) : $location;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // @-operator is used to prevent possible warnings in PHP < 5.3.3.
- $lp = @parse_url( $test );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $lp = parse_url( $test );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Give up if malformed URL.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $lp ) {
</span></span></pre>
</div>
</div>
</body>
</html>