<!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>[BuddyPress][13898] trunk: Use `wp_parse_url` instead of `parse_url` to parse URLs.</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="http://buddypress.trac.wordpress.org/changeset/13898">13898</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/13898","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>espellcaste</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-06-02 17:55:08 +0000 (Sun, 02 Jun 2024)</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'>Use `wp_parse_url` instead of `parse_url` to parse URLs.
Props imath
Closes https://github.com/buddypress/buddypress/pull/307
See <a href="http://buddypress.trac.wordpress.org/ticket/7228">#7228</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcorefunctionsphp">trunk/src/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunksrcbpcoreclassesclassbpmediaextractorphp">trunk/src/bp-core/classes/class-bp-media-extractor.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveaubuddypressfunctionsphp">trunk/src/bp-templates/bp-nouveau/buddypress-functions.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludesmessagesfunctionsphp">trunk/src/bp-templates/bp-nouveau/includes/messages/functions.php</a></li>
<li><a href="#trunksrcbpxprofileclassesclassbpxprofilefieldtypetelephonephp">trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-telephone.php</a></li>
<li><a href="#trunktestsphpunittestcasescorefunctionsbpVerifyNonceRequestphp">trunk/tests/phpunit/testcases/core/functions/bpVerifyNonceRequest.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-functions.php 2024-06-02 17:52:42 UTC (rev 13897)
+++ trunk/src/bp-core/bp-core-functions.php 2024-06-02 17:55:08 UTC (rev 13898)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2397,7 +2397,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Parse home_url() into pieces to remove query-strings, strange characters,
</span><span class="cx" style="display: block; padding: 0 10px"> // and other funny things that plugins might to do to it.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parsed_home = parse_url( home_url( '/', ( is_ssl() ? 'https' : 'http' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed_home = wp_parse_url( home_url( '/', ( is_ssl() ? 'https' : 'http' ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Maybe include the port, if it's included in home_url().
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $parsed_home['port'] ) ) {
</span></span></pre></div>
<a id="trunksrcbpcoreclassesclassbpmediaextractorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/classes/class-bp-media-extractor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/classes/class-bp-media-extractor.php 2024-06-02 17:52:42 UTC (rev 13897)
+++ trunk/src/bp-core/classes/class-bp-media-extractor.php 2024-06-02 17:55:08 UTC (rev 13898)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -630,7 +630,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</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">- $path = untrailingslashit( parse_url( $audio['attributes'][ $src_param ], PHP_URL_PATH ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $path = untrailingslashit( wp_parse_url( $audio['attributes'][ $src_param ], PHP_URL_PATH ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $audio_types as $extension ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $extension = '.' . $extension;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -727,7 +727,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</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">- $path = untrailingslashit( parse_url( $video['attributes'][ $src_param ], PHP_URL_PATH ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $path = untrailingslashit( wp_parse_url( $video['attributes'][ $src_param ], PHP_URL_PATH ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $video_types as $extension ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $extension = '.' . $extension;
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveaubuddypressfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/buddypress-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/buddypress-functions.php 2024-06-02 17:52:42 UTC (rev 13897)
+++ trunk/src/bp-templates/bp-nouveau/buddypress-functions.php 2024-06-02 17:55:08 UTC (rev 13898)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -705,7 +705,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $path;
</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">- $uri = parse_url( $path );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $uri = wp_parse_url( $path );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === strpos( $uri['path'], 'customize.php' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $path;
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludesmessagesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/includes/messages/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/messages/functions.php 2024-06-02 17:52:42 UTC (rev 13897)
+++ trunk/src/bp-templates/bp-nouveau/includes/messages/functions.php 2024-06-02 17:55:08 UTC (rev 13898)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,7 +157,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: number of message recipients */
</span><span class="cx" style="display: block; padding: 0 10px"> 'more' => __( '(and %d others)', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'rootUrl' => parse_url( $root_url, PHP_URL_PATH ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'rootUrl' => wp_parse_url( $root_url, PHP_URL_PATH ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'supportedRoutes' => $routes,
</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="trunksrcbpxprofileclassesclassbpxprofilefieldtypetelephonephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-telephone.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-telephone.php 2024-06-02 17:52:42 UTC (rev 13897)
+++ trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type-telephone.php 2024-06-02 17:55:08 UTC (rev 13898)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function display_filter( $field_value, $field_id = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = wp_strip_all_tags( $field_value );
</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 = wp_parse_url( $url );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add the tel:// protocol to the field value.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $parts['scheme'] ) ) {
</span></span></pre></div>
<a id="trunktestsphpunittestcasescorefunctionsbpVerifyNonceRequestphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/core/functions/bpVerifyNonceRequest.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/core/functions/bpVerifyNonceRequest.php 2024-06-02 17:52:42 UTC (rev 13897)
+++ trunk/tests/phpunit/testcases/core/functions/bpVerifyNonceRequest.php 2024-06-02 17:55:08 UTC (rev 13898)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +74,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function add_port_and_subdirectory_to_home_url( $url, $path, $scheme ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $home = parse_url( get_option( 'home' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $home = wp_parse_url( get_option( 'home' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $home_path = isset( $home['path'] ) ? $home['path'] : '';
</span><span class="cx" style="display: block; padding: 0 10px"> return $scheme . '://' . $home['host'] . ':80' . $home_path . '/wordpress' . $path;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>