<!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>[53455] trunk: General: Replace all `esc_url_raw()` calls in core with `sanitize_url()`.</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/53455">53455</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/53455","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>2022-06-01 18:12:25 +0000 (Wed, 01 Jun 2022)</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'>General: Replace all `esc_url_raw()` calls in core with `sanitize_url()`.
This aims to improve performance by calling `sanitize_url()` directly, instead of the `esc_url_raw()` wrapper. As of WordPress 6.1, `sanitize_url()` is the recommended function for sanitizing a URL for database or redirect usage.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/11383">[11383]</a>, <a href="https://core.trac.wordpress.org/changeset/13096">[13096]</a>, <a href="https://core.trac.wordpress.org/changeset/51597">[51597]</a>, <a href="https://core.trac.wordpress.org/changeset/53452">[53452]</a>.
Props benjgrolleau, peterwilsoncc, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/55852">#55852</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminedittagformphp">trunk/src/wp-admin/edit-tag-form.php</a></li>
<li><a href="#trunksrcwpadminedittagsphp">trunk/src/wp-admin/edit-tags.php</a></li>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesclasscustombackgroundphp">trunk/src/wp-admin/includes/class-custom-background.php</a></li>
<li><a href="#trunksrcwpadminincludesclasscustomimageheaderphp">trunk/src/wp-admin/includes/class-custom-image-header.php</a></li>
<li><a href="#trunksrcwpadminincludesexportphp">trunk/src/wp-admin/includes/export.php</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.php</a></li>
<li><a href="#trunksrcwpadminincludesprivacytoolsphp">trunk/src/wp-admin/includes/privacy-tools.php</a></li>
<li><a href="#trunksrcwpadminincludesthemephp">trunk/src/wp-admin/includes/theme.php</a></li>
<li><a href="#trunksrcwpadminincludesuserphp">trunk/src/wp-admin/includes/user.php</a></li>
<li><a href="#trunksrcwpadminnetworksiteinfophp">trunk/src/wp-admin/network/site-info.php</a></li>
<li><a href="#trunksrcwpadmintermphp">trunk/src/wp-admin/term.php</a></li>
<li><a href="#trunksrcwpadminupgradephp">trunk/src/wp-admin/upgrade.php</a></li>
<li><a href="#trunksrcwpadminusereditphp">trunk/src/wp-admin/user-edit.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemephp">trunk/src/wp-includes/class-wp-theme.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizenavmenuitemsettingphp">trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php</a></li>
<li><a href="#trunksrcwpincludesdefaultfiltersphp">trunk/src/wp-includes/default-filters.php</a></li>
<li><a href="#trunksrcwpincludesdeprecatedphp">trunk/src/wp-includes/deprecated.php</a></li>
<li><a href="#trunksrcwpincludesembedphp">trunk/src/wp-includes/embed.php</a></li>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.php</a></li>
<li><a href="#trunksrcwpincludesmsdeprecatedphp">trunk/src/wp-includes/ms-deprecated.php</a></li>
<li><a href="#trunksrcwpincludesnavmenuphp">trunk/src/wp-includes/nav-menu.php</a></li>
<li><a href="#trunksrcwpincludesrestapiclasswprestserverphp">trunk/src/wp-includes/rest-api/class-wp-rest-server.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestmenuitemscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-menu-items-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswpresturldetailscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-url-details-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiphp">trunk/src/wp-includes/rest-api.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
<li><a href="#trunksrcwpincludesthemephp">trunk/src/wp-includes/theme.php</a></li>
<li><a href="#trunksrcwpincludesupdatephp">trunk/src/wp-includes/update.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsphp">trunk/src/wp-includes/widgets.php</a></li>
<li><a href="#trunksrcwploginphp">trunk/src/wp-login.php</a></li>
<li><a href="#trunktestsphpunittestsformattingescUrlphp">trunk/tests/phpunit/tests/formatting/escUrl.php</a></li>
<li><a href="#trunktestsphpunittestslinkthemeFilephp">trunk/tests/phpunit/tests/link/themeFile.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestserverphp">trunk/tests/phpunit/tests/rest-api/rest-server.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminedittagformphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-tag-form.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-tag-form.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-admin/edit-tag-form.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,7 +83,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="message" class="notice notice-<?php echo $class; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><strong><?php echo $message; ?></strong></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $wp_http_referer ) { ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><a href="<?php echo esc_url( wp_validate_redirect( esc_url_raw( $wp_http_referer ), admin_url( 'term.php?taxonomy=' . $taxonomy ) ) ); ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><a href="<?php echo esc_url( wp_validate_redirect( sanitize_url( $wp_http_referer ), admin_url( 'term.php?taxonomy=' . $taxonomy ) ) ); ?>">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php echo esc_html( $tax->labels->back_to_items ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </a></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span></span></pre></div>
<a id="trunksrcwpadminedittagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-tags.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-admin/edit-tags.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,7 +160,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'You attempted to edit an item that does not exist. Perhaps it was deleted?' ) );
</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">- wp_redirect( esc_url_raw( get_edit_term_link( $term_id, $taxonomy, $post_type ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_redirect( sanitize_url( get_edit_term_link( $term_id, $taxonomy, $post_type ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'editedtag':
</span></span></pre></div>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -431,7 +431,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $total = isset( $_POST['_total'] ) ? (int) $_POST['_total'] : 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $per_page = isset( $_POST['_per_page'] ) ? (int) $_POST['_per_page'] : 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $page = isset( $_POST['_page'] ) ? (int) $_POST['_page'] : 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = isset( $_POST['_url'] ) ? esc_url_raw( $_POST['_url'] ) : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = isset( $_POST['_url'] ) ? sanitize_url( $_POST['_url'] ) : '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // JS didn't send us everything we need to know. Just die with success message.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $total || ! $per_page || ! $page || ! $url ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3333,7 +3333,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $src = 'http://' . $src;
</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">- $src = esc_url_raw( $src );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $src = sanitize_url( $src );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $src ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasscustombackgroundphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-custom-background.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-custom-background.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-admin/includes/class-custom-background.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -526,10 +526,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $id, '_wp_attachment_is_custom_background', get_option( 'stylesheet' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- set_theme_mod( 'background_image', esc_url_raw( $url ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ set_theme_mod( 'background_image', sanitize_url( $url ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $thumbnail = wp_get_attachment_image_src( $id, 'thumbnail' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- set_theme_mod( 'background_image_thumb', esc_url_raw( $thumbnail[0] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ set_theme_mod( 'background_image_thumb', sanitize_url( $thumbnail[0] ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-admin/includes/class-custom-image-header.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'wp_create_file_in_uploads', $file, $id ); // For replication.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -618,8 +618,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $url = wp_get_attachment_image_src( $attachment_id, $size );
</span><span class="cx" style="display: block; padding: 0 10px"> $thumbnail = wp_get_attachment_image_src( $attachment_id, 'thumbnail' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- set_theme_mod( 'background_image', esc_url_raw( $url[0] ) );
- set_theme_mod( 'background_image_thumb', esc_url_raw( $thumbnail[0] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ set_theme_mod( 'background_image', sanitize_url( $url[0] ) );
+ set_theme_mod( 'background_image_thumb', sanitize_url( $thumbnail[0] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> exit;
</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="trunksrcwpadminincludesclasscustomimageheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-custom-image-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-custom-image-header.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-admin/includes/class-custom-image-header.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1159,7 +1159,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- $choice['url'] = esc_url_raw( $choice['url'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $choice['url'] = sanitize_url( $choice['url'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $header_image_data = (object) array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'attachment_id' => $choice['attachment_id'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1197,7 +1197,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">- set_theme_mod( 'header_image', esc_url_raw( $header_image_data['url'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ set_theme_mod( 'header_image', sanitize_url( $header_image_data['url'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> set_theme_mod( 'header_image_data', $header_image_data );
</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="trunksrcwpadminincludesexportphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/export.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/export.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-admin/includes/export.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -632,7 +632,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:comment_id><?php echo (int) $c->comment_ID; ?></wp:comment_id>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:comment_author><?php echo wxr_cdata( $c->comment_author ); ?></wp:comment_author>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:comment_author_email><?php echo wxr_cdata( $c->comment_author_email ); ?></wp:comment_author_email>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <wp:comment_author_url><?php echo esc_url_raw( $c->comment_author_url ); ?></wp:comment_author_url>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <wp:comment_author_url><?php echo sanitize_url( $c->comment_author_url ); ?></wp:comment_author_url>
</ins><span class="cx" style="display: block; padding: 0 10px"> <wp:comment_author_IP><?php echo wxr_cdata( $c->comment_author_IP ); ?></wp:comment_author_IP>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:comment_date><?php echo wxr_cdata( $c->comment_date ); ?></wp:comment_date>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:comment_date_gmt><?php echo wxr_cdata( $c->comment_date_gmt ); ?></wp:comment_date_gmt>
</span></span></pre></div>
<a id="trunksrcwpadminincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/media.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-admin/includes/media.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -917,7 +917,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $src Media source URL.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $title Media title.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $html = apply_filters( "{$type}_send_to_editor_url", $html, esc_url_raw( $src ), $title );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $html = apply_filters( "{$type}_send_to_editor_url", $html, sanitize_url( $src ), $title );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $align = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $alt = esc_attr( wp_unslash( $_POST['alt'] ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -942,7 +942,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $align The image alignment. Default 'alignnone'. Possible values include
</span><span class="cx" style="display: block; padding: 0 10px"> * 'alignleft', 'aligncenter', 'alignright', 'alignnone'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $html = apply_filters( 'image_send_to_editor_url', $html, esc_url_raw( $src ), $alt, $align );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $html = apply_filters( 'image_send_to_editor_url', $html, sanitize_url( $src ), $alt, $align );
</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"> return media_send_to_editor( $html );
</span></span></pre></div>
<a id="trunksrcwpadminincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/post.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-admin/includes/post.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,7 +322,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $format_meta_urls as $format_meta_url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $keyed = '_format_' . $format_meta_url;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $post_data[ $keyed ] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_post_meta( $post_ID, $keyed, wp_slash( esc_url_raw( wp_unslash( $post_data[ $keyed ] ) ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_post_meta( $post_ID, $keyed, wp_slash( sanitize_url( wp_unslash( $post_data[ $keyed ] ) ) ) );
</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">
</span></span></pre></div>
<a id="trunksrcwpadminincludesprivacytoolsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/privacy-tools.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/privacy-tools.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-admin/includes/privacy-tools.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -706,10 +706,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content = apply_filters( 'wp_privacy_personal_data_email_content', $email_text, $request_id, $email_data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###EXPIRATION###', $expiration_date, $content );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content = str_replace( '###LINK###', esc_url_raw( $export_file_url ), $content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = str_replace( '###LINK###', sanitize_url( $export_file_url ), $content );
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###EMAIL###', $request_email, $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###SITENAME###', $site_name, $content );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content = str_replace( '###SITEURL###', esc_url_raw( $site_url ), $content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = str_replace( '###SITEURL###', sanitize_url( $site_url ), $content );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $headers = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/theme.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-admin/includes/theme.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -712,7 +712,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $customize_action = esc_url(
</span><span class="cx" style="display: block; padding: 0 10px"> add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'return' => urlencode( esc_url_raw( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'return' => urlencode( sanitize_url( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> wp_customize_url( $slug )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunksrcwpadminincludesuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/user.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-admin/includes/user.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,7 +84,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $_POST['url'] ) || 'http://' === $_POST['url'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user->user_url = '';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user->user_url = esc_url_raw( $_POST['url'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user->user_url = sanitize_url( $_POST['url'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $protocols = implode( '|', array_map( 'preg_quote', wp_allowed_protocols() ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $user->user_url = preg_match( '/^(' . $protocols . '):/is', $user->user_url ) ? $user->user_url : 'http://' . $user->user_url;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminnetworksiteinfophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/site-info.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-info.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-admin/network/site-info.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +90,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $old_home_parsed = parse_url( $old_home_url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $old_home_parsed['host'] === $existing_details->domain && $old_home_parsed['path'] === $existing_details->path ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $new_home_url = untrailingslashit( esc_url_raw( $blog_data['scheme'] . '://' . $new_details->domain . $new_details->path ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $new_home_url = untrailingslashit( sanitize_url( $blog_data['scheme'] . '://' . $new_details->domain . $new_details->path ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'home', $new_home_url );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +98,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $old_site_parsed = parse_url( $old_site_url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $old_site_parsed['host'] === $existing_details->domain && $old_site_parsed['path'] === $existing_details->path ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $new_site_url = untrailingslashit( esc_url_raw( $blog_data['scheme'] . '://' . $new_details->domain . $new_details->path ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $new_site_url = untrailingslashit( sanitize_url( $blog_data['scheme'] . '://' . $new_details->domain . $new_details->path ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'siteurl', $new_site_url );
</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="trunksrcwpadmintermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/term.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/term.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-admin/term.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sendback = add_query_arg( 'post_type', get_current_screen()->post_type, $sendback );
</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">- wp_redirect( esc_url_raw( $sendback ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_redirect( sanitize_url( $sendback ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> exit;
</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="trunksrcwpadminupgradephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/upgrade.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-admin/upgrade.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +133,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 0:
</span><span class="cx" style="display: block; padding: 0 10px"> $goback = wp_get_referer();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $goback ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $goback = esc_url_raw( $goback );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $goback = sanitize_url( $goback );
</ins><span class="cx" style="display: block; padding: 0 10px"> $goback = urlencode( $goback );
</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="trunksrcwpadminusereditphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/user-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/user-edit.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-admin/user-edit.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +209,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p><strong><?php _e( 'User updated.' ); ?></strong></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $wp_http_referer && false === strpos( $wp_http_referer, 'user-new.php' ) && ! IS_PROFILE_PAGE ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><a href="<?php echo esc_url( wp_validate_redirect( esc_url_raw( $wp_http_referer ), self_admin_url( 'users.php' ) ) ); ?>"><?php _e( '← Go to Users' ); ?></a></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><a href="<?php echo esc_url( wp_validate_redirect( sanitize_url( $wp_http_referer ), self_admin_url( 'users.php' ) ) ); ?>"><?php _e( '← Go to Users' ); ?></a></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizemanagerphp"></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-customize-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-manager.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2111,7 +2111,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $exported_setting_validities = array_map( array( $this, 'prepare_setting_validity_for_js' ), $setting_validities );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Note that the REQUEST_URI is not passed into home_url() since this breaks subdirectory installations.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $self_url = empty( $_SERVER['REQUEST_URI'] ) ? home_url( '/' ) : esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $self_url = empty( $_SERVER['REQUEST_URI'] ) ? home_url( '/' ) : sanitize_url( wp_unslash( $_SERVER['REQUEST_URI'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $state_query_params = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'customize_theme',
</span><span class="cx" style="display: block; padding: 0 10px"> 'customize_changeset_uuid',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2158,7 +2158,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'self' => $self_url,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'allowed' => array_map( 'esc_url_raw', $this->get_allowed_urls() ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'allowed' => array_map( 'sanitize_url', $this->get_allowed_urls() ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'allowedHosts' => array_unique( $allowed_hosts ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'isCrossDomain' => $this->is_cross_domain(),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4574,7 +4574,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $preview_url URL to be previewed.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function set_preview_url( $preview_url ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $preview_url = esc_url_raw( $preview_url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $preview_url = sanitize_url( $preview_url );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->preview_url = wp_validate_redirect( $preview_url, home_url( '/' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4662,7 +4662,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $return_url URL for return link.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function set_return_url( $return_url ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $return_url = esc_url_raw( $return_url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $return_url = sanitize_url( $return_url );
</ins><span class="cx" style="display: block; padding: 0 10px"> $return_url = remove_query_arg( wp_removable_query_args(), $return_url );
</span><span class="cx" style="display: block; padding: 0 10px"> $return_url = wp_validate_redirect( $return_url );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->return_url = $return_url;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4894,15 +4894,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '_canInstall' => current_user_can( 'install_themes' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'preview' => esc_url_raw( $this->get_preview_url() ),
- 'return' => esc_url_raw( $this->get_return_url() ),
- 'parent' => esc_url_raw( admin_url() ),
- 'activated' => esc_url_raw( home_url( '/' ) ),
- 'ajax' => esc_url_raw( admin_url( 'admin-ajax.php', 'relative' ) ),
- 'allowed' => array_map( 'esc_url_raw', $this->get_allowed_urls() ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'preview' => sanitize_url( $this->get_preview_url() ),
+ 'return' => sanitize_url( $this->get_return_url() ),
+ 'parent' => sanitize_url( admin_url() ),
+ 'activated' => sanitize_url( home_url( '/' ) ),
+ 'ajax' => sanitize_url( admin_url( 'admin-ajax.php', 'relative' ) ),
+ 'allowed' => array_map( 'sanitize_url', $this->get_allowed_urls() ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'isCrossDomain' => $this->is_cross_domain(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'home' => esc_url_raw( home_url( '/' ) ),
- 'login' => esc_url_raw( $login_url ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'home' => sanitize_url( home_url( '/' ) ),
+ 'login' => sanitize_url( $login_url ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'browser' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'mobile' => wp_is_mobile(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6006,7 +6006,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'invalid_value', __( 'Invalid value for background size.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'background_image' === $setting->id || 'background_image_thumb' === $setting->id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $value = empty( $value ) ? '' : esc_url_raw( $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $value = empty( $value ) ? '' : sanitize_url( $value );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'unrecognized_setting', __( 'Unrecognized background setting.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6079,7 +6079,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function _validate_external_header_video( $validity, $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $video = esc_url_raw( $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $video = sanitize_url( $value );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $video ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! preg_match( '#^https?://(?:www\.)?(?:youtube\.com/watch|youtu\.be/)#', $video ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $validity->add( 'invalid_url', __( 'Please enter a valid YouTube URL.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6097,7 +6097,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Sanitized URL.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function _sanitize_external_header_video( $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return esc_url_raw( trim( $value ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return sanitize_url( trim( $value ) );
</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"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpthemephp"></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-theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-includes/class-wp-theme.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -888,7 +888,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'ThemeURI':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'AuthorURI':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $value = esc_url_raw( $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $value = sanitize_url( $value );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'Tags':
</span><span class="cx" style="display: block; padding: 0 10px"> $value = array_filter( array_map( 'trim', explode( ',', strip_tags( $value ) ) ) );
</span></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizenavmenuitemsettingphp"></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/customize/class-wp-customize-nav-menu-item-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -726,7 +726,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_value['description'] = wp_unslash( apply_filters( 'content_save_pre', wp_slash( $menu_item_value['description'] ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== $menu_item_value['url'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_item_value['url'] = esc_url_raw( $menu_item_value['url'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_item_value['url'] = sanitize_url( $menu_item_value['url'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( '' === $menu_item_value['url'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'invalid_url', __( 'Invalid URL.' ) ); // Fail sanitization if URL is invalid.
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesdefaultfiltersphp"></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/default-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-filters.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-includes/default-filters.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'pre_post_guid',
</span><span class="cx" style="display: block; padding: 0 10px"> ) as $filter ) {
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( $filter, 'wp_strip_all_tags' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( $filter, 'esc_url_raw' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( $filter, 'sanitize_url' );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( $filter, 'wp_filter_kses' );
</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="trunksrcwpincludesdeprecatedphp"></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/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/deprecated.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-includes/deprecated.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2041,7 +2041,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function clean_url( $url, $protocols = null, $context = 'display' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $context == 'db' )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _deprecated_function( 'clean_url( $context = \'db\' )', '3.0.0', 'esc_url_raw()' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _deprecated_function( 'clean_url( $context = \'db\' )', '3.0.0', 'sanitize_url()' );
</ins><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '3.0.0', 'esc_url()' );
</span><span class="cx" style="display: block; padding: 0 10px"> return esc_url( $url, $protocols, $context );
</span></span></pre></div>
<a id="trunksrcwpincludesembedphp"></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/embed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/embed.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-includes/embed.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -426,7 +426,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $embed_url The post embed URL.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post $post The corresponding post object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return esc_url_raw( apply_filters( 'post_embed_url', $embed_url, $post ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return sanitize_url( apply_filters( 'post_embed_url', $embed_url, $post ) );
</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"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesformattingphp"></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/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-includes/formatting.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4354,7 +4354,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $url The URL to be cleaned.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string[] $protocols Optional. An array of acceptable protocols.
</span><span class="cx" style="display: block; padding: 0 10px"> * Defaults to return value of wp_allowed_protocols().
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $_context Private. Use esc_url_raw() for database usage.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $_context Private. Use sanitize_url() for database usage.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The cleaned URL after the {@see 'clean_url'} filter is applied.
</span><span class="cx" style="display: block; padding: 0 10px"> * An empty string is returned if `$url` specifies a protocol other than
</span><span class="cx" style="display: block; padding: 0 10px"> * those in `$protocols`, or if `$url` contains an empty string.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4830,7 +4830,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'ping_sites':
</span><span class="cx" style="display: block; padding: 0 10px"> $value = explode( "\n", $value );
</span><span class="cx" style="display: block; padding: 0 10px"> $value = array_filter( array_map( 'trim', $value ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $value = array_filter( array_map( 'esc_url_raw', $value ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $value = array_filter( array_map( 'sanitize_url', $value ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = implode( "\n", $value );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4844,7 +4844,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $error = $value->get_error_message();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '#http(s?)://(.+)#i', $value ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $value = esc_url_raw( $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $value = sanitize_url( $value );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $error = __( 'The WordPress address you entered did not appear to be a valid URL. Please enter a valid URL.' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4857,7 +4857,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $error = $value->get_error_message();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '#http(s?)://(.+)#i', $value ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $value = esc_url_raw( $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $value = sanitize_url( $value );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $error = __( 'The Site address you entered did not appear to be a valid URL. Please enter a valid URL.' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4929,7 +4929,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $value ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $error = $value->get_error_message();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $value = esc_url_raw( $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $value = sanitize_url( $value );
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = str_replace( 'http://', '', $value );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5580,7 +5580,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $urls_to_ping[ $k ] );
</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">- $urls_to_ping = array_map( 'esc_url_raw', $urls_to_ping );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $urls_to_ping = array_map( 'sanitize_url', $urls_to_ping );
</ins><span class="cx" style="display: block; padding: 0 10px"> $urls_to_ping = implode( "\n", $urls_to_ping );
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters a list of trackback URLs following sanitization.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5649,7 +5649,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"> if ( preg_match( '/<a\s[^>]*?href=([\'"])(.+?)\1/is', $content, $matches ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return esc_url_raw( $matches[2] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return sanitize_url( $matches[2] );
</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"> return false;
</span></span></pre></div>
<a id="trunksrcwpincludesgeneraltemplatephp"></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/general-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/general-template.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-includes/general-template.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4759,10 +4759,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $gen = '<generator uri="https://wordpress.org/" version="' . esc_attr( get_bloginfo_rss( 'version' ) ) . '">WordPress</generator>';
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'rss2':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $gen = '<generator>' . esc_url_raw( 'https://wordpress.org/?v=' . get_bloginfo_rss( 'version' ) ) . '</generator>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $gen = '<generator>' . sanitize_url( 'https://wordpress.org/?v=' . get_bloginfo_rss( 'version' ) ) . '</generator>';
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'rdf':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $gen = '<admin:generatorAgent rdf:resource="' . esc_url_raw( 'https://wordpress.org/?v=' . get_bloginfo_rss( 'version' ) ) . '" />';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $gen = '<admin:generatorAgent rdf:resource="' . sanitize_url( 'https://wordpress.org/?v=' . get_bloginfo_rss( 'version' ) ) . '" />';
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'comment':
</span><span class="cx" style="display: block; padding: 0 10px"> $gen = '<!-- generator="WordPress/' . esc_attr( get_bloginfo( 'version' ) ) . '" -->';
</span></span></pre></div>
<a id="trunksrcwpincludeslinktemplatephp"></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/link-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/link-template.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-includes/link-template.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2343,7 +2343,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $pagenum Optional. Page number. Default 1.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $escape Optional. Whether to escape the URL for display, with esc_url(). Defaults to true.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Otherwise, prepares the URL with esc_url_raw().
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Otherwise, prepares the URL with sanitize_url().
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string The link URL for the given page number.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_pagenum_link( $pagenum = 1, $escape = true ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2410,7 +2410,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $escape ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return esc_url( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return esc_url_raw( $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return sanitize_url( $result );
</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">
</span></span></pre></div>
<a id="trunksrcwpincludesmsdeprecatedphp"></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/ms-deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-deprecated.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-includes/ms-deprecated.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -378,7 +378,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = 'http://' . $domain . $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">- return esc_url_raw( $url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return sanitize_url( $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"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesnavmenuphp"></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/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/nav-menu.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-includes/nav-menu.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -573,7 +573,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args['menu-item-xfn'] = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['menu-item-xfn'] ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $menu_item_db_id, '_menu_item_classes', $args['menu-item-classes'] );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $menu_item_db_id, '_menu_item_xfn', $args['menu-item-xfn'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_post_meta( $menu_item_db_id, '_menu_item_url', esc_url_raw( $args['menu-item-url'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_post_meta( $menu_item_db_id, '_menu_item_url', sanitize_url( $args['menu-item-url'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 == $menu_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $menu_item_db_id, '_menu_item_orphaned', (string) time() );
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiclasswprestserverphp"></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/rest-api/class-wp-rest-server.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/class-wp-rest-server.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-includes/rest-api/class-wp-rest-server.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -284,7 +284,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $api_root = get_rest_url();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $api_root ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->send_header( 'Link', '<' . esc_url_raw( $api_root ) . '>; rel="https://api.w.org/"' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->send_header( 'Link', '<' . sanitize_url( $api_root ) . '>; rel="https://api.w.org/"' );
</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"> /*
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestmenuitemscontrollerphp"></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/rest-api/endpoints/class-wp-rest-menu-items-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-menu-items-controller.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-menu-items-controller.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -860,7 +860,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</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">- if ( esc_url_raw( $url ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( sanitize_url( $url ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</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="trunksrcwpincludesrestapiendpointsclasswpresturldetailscontrollerphp"></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/rest-api/endpoints/class-wp-rest-url-details-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-url-details-controller.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-url-details-controller.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,7 +45,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'required' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'The URL to process.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'validate_callback' => 'wp_http_validate_url',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'sanitize_callback' => 'esc_url_raw',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'sanitize_callback' => 'sanitize_url',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</span><span class="cx" style="display: block; padding: 0 10px"> 'format' => 'uri',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiphp"></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/rest-api.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-includes/rest-api.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -710,7 +710,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $origin ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Requests from file:// and data: URLs send "Origin: null".
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'null' !== $origin ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $origin = esc_url_raw( $origin );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $origin = sanitize_url( $origin );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Access-Control-Allow-Origin: ' . $origin );
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Access-Control-Allow-Methods: OPTIONS, GET, POST, PUT, PATCH, DELETE' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -993,12 +993,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- header( sprintf( 'Link: <%s>; rel="https://api.w.org/"', esc_url_raw( $api_root ) ), false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ header( sprintf( 'Link: <%s>; rel="https://api.w.org/"', sanitize_url( $api_root ) ), false );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $resource = rest_get_queried_resource_route();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $resource ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- header( sprintf( 'Link: <%s>; rel="alternate"; type="application/json"', esc_url_raw( rest_url( $resource ) ) ), false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ header( sprintf( 'Link: <%s>; rel="alternate"; type="application/json"', sanitize_url( rest_url( $resource ) ) ), false );
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2795,7 +2795,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return sanitize_text_field( $value );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'uri':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return esc_url_raw( $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return sanitize_url( $value );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'ip':
</span><span class="cx" style="display: block; padding: 0 10px"> return sanitize_text_field( $value );
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></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/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-includes/script-loader.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -337,7 +337,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-api-fetch',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp.apiFetch.use( wp.apiFetch.createRootURLMiddleware( "%s" ) );',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_url_raw( get_rest_url() )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sanitize_url( get_rest_url() )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'after'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -750,7 +750,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-api-request',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wpApiSettings',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'root' => esc_url_raw( get_rest_url() ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'root' => sanitize_url( get_rest_url() ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'nonce' => wp_installing() ? '' : wp_create_nonce( 'wp_rest' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'versionString' => 'wp/v2/',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunksrcwpincludesthemephp"></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/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-includes/theme.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1179,7 +1179,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = get_random_header_image();
</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">- return esc_url_raw( set_url_scheme( $url ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return sanitize_url( set_url_scheme( $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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1428,7 +1428,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"> foreach ( (array) $headers as $header ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = esc_url_raw( wp_get_attachment_url( $header->ID ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = sanitize_url( wp_get_attachment_url( $header->ID ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $header_data = wp_get_attachment_metadata( $header->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> $header_index = $header->ID;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1589,7 +1589,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">- return esc_url_raw( set_url_scheme( $url ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return sanitize_url( set_url_scheme( $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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1806,7 +1806,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $style = $color ? "background-color: #$color;" : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $background ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image = ' background-image: url("' . esc_url_raw( $background ) . '");';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $image = ' background-image: url("' . sanitize_url( $background ) . '");';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Background Position.
</span><span class="cx" style="display: block; padding: 0 10px"> $position_x = get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2146,7 +2146,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Support externally referenced styles (like, say, fonts).
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $editor_styles as $key => $file ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '~^(https?:)?//~', $file ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $stylesheets[] = esc_url_raw( $file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $stylesheets[] = sanitize_url( $file );
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $editor_styles[ $key ] );
</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="trunksrcwpincludesupdatephp"></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/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/update.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-includes/update.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -430,7 +430,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">- $hostname = wp_parse_url( esc_url_raw( $plugin_data['UpdateURI'] ), PHP_URL_HOST );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $hostname = wp_parse_url( sanitize_url( $plugin_data['UpdateURI'] ), PHP_URL_HOST );
</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"> * Filters the update response for a given plugin hostname.
</span></span></pre></div>
<a id="trunksrcwpincludesuserphp"></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/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-includes/user.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4158,8 +4158,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###SITENAME###', $email_data['sitename'], $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###USER_EMAIL###', $email_data['user_email'], $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###DESCRIPTION###', $email_data['description'], $content );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content = str_replace( '###MANAGE_URL###', esc_url_raw( $email_data['manage_url'] ), $content );
- $content = str_replace( '###SITEURL###', esc_url_raw( $email_data['siteurl'] ), $content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = str_replace( '###MANAGE_URL###', sanitize_url( $email_data['manage_url'] ), $content );
+ $content = str_replace( '###SITEURL###', sanitize_url( $email_data['siteurl'] ), $content );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $headers = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4399,7 +4399,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###SITENAME###', $email_data['sitename'], $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###PRIVACY_POLICY_URL###', $email_data['privacy_policy_url'], $content );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content = str_replace( '###SITEURL###', esc_url_raw( $email_data['siteurl'] ), $content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = str_replace( '###SITEURL###', sanitize_url( $email_data['siteurl'] ), $content );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $headers = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4720,10 +4720,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content = apply_filters( 'user_request_action_email_content', $content, $email_data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###DESCRIPTION###', $email_data['description'], $content );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content = str_replace( '###CONFIRM_URL###', esc_url_raw( $email_data['confirm_url'] ), $content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = str_replace( '###CONFIRM_URL###', sanitize_url( $email_data['confirm_url'] ), $content );
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###EMAIL###', $email_data['email'], $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( '###SITENAME###', $email_data['sitename'], $content );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content = str_replace( '###SITEURL###', esc_url_raw( $email_data['siteurl'] ), $content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = str_replace( '###SITEURL###', sanitize_url( $email_data['siteurl'] ), $content );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $headers = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsphp"></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/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-includes/widgets.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1767,7 +1767,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $items < 1 || 20 < $items ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $items = 10;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = esc_url_raw( strip_tags( $widget_rss['url'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = sanitize_url( strip_tags( $widget_rss['url'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = isset( $widget_rss['title'] ) ? trim( strip_tags( $widget_rss['title'] ) ) : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $show_summary = isset( $widget_rss['show_summary'] ) ? (int) $widget_rss['show_summary'] : 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $show_author = isset( $widget_rss['show_author'] ) ? (int) $widget_rss['show_author'] : 0;
</span></span></pre></div>
<a id="trunksrcwploginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-login.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-login.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/src/wp-login.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -360,7 +360,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( isset( $_GET['redirect_to'] ) && '' !== $_GET['redirect_to'] ) { ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="hidden" name="redirect_to" value="<?php echo esc_url_raw( $_GET['redirect_to'] ); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="hidden" name="redirect_to" value="<?php echo sanitize_url( $_GET['redirect_to'] ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( isset( $_GET['action'] ) && '' !== $_GET['action'] ) { ?>
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingescUrlphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/formatting/escUrl.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/escUrl.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/tests/phpunit/tests/formatting/escUrl.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +56,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> parse_url( $url )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( 'https://user:pass@host.example.com:1234/path;p=1?query=2&r%5B%5D=3#fragment', esc_url_raw( $url ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'https://user:pass@host.example.com:1234/path;p=1?query=2&r%5B%5D=3#fragment', sanitize_url( $url ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'https://user:pass@host.example.com:1234/path;p=1?query=2&r%5B%5D=3#fragment', esc_url( $url ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,9 +69,9 @@
</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"> public function test_encoding() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( 'http://example.com?foo=1&bar=2', esc_url_raw( 'http://example.com?foo=1&bar=2' ) );
- $this->assertSame( 'http://example.com?foo=1&bar=2', esc_url_raw( 'http://example.com?foo=1&bar=2' ) );
- $this->assertSame( 'http://example.com?foo=1&bar=2', esc_url_raw( 'http://example.com?foo=1&bar=2' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'http://example.com?foo=1&bar=2', sanitize_url( 'http://example.com?foo=1&bar=2' ) );
+ $this->assertSame( 'http://example.com?foo=1&bar=2', sanitize_url( 'http://example.com?foo=1&bar=2' ) );
+ $this->assertSame( 'http://example.com?foo=1&bar=2', sanitize_url( 'http://example.com?foo=1&bar=2' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://example.com?foo=1&bar=2', esc_url( 'http://example.com?foo=1&bar=2' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 'http://example.com?foo=1&bar=2', esc_url( 'http://example.com?foo=1&bar=2' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,7 +190,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_reserved_characters() {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = "http://example.com/:@-._~!$&'()*+,=;:@-._~!$&'()*+,=:@-._~!$&'()*+,==?/?:@-._~!$%27()*+,;=/?:@-._~!$%27()*+,;==#/?:@-._~!$&'()*+,;=";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $url, esc_url_raw( $url ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $url, sanitize_url( $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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,7 +245,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 28015
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_invalid_charaters() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEmpty( esc_url_raw( '"^<>{}`' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEmpty( sanitize_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"> /**
</span></span></pre></div>
<a id="trunktestsphpunittestslinkthemeFilephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/link/themeFile.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link/themeFile.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/tests/phpunit/tests/link/themeFile.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,8 +144,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $uri = get_theme_file_uri( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_uri = get_parent_theme_file_uri( $file );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( esc_url_raw( $uri ), $uri );
- $this->assertSame( esc_url_raw( $parent_uri ), $parent_uri );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( sanitize_url( $uri ), $uri );
+ $this->assertSame( sanitize_url( $parent_uri ), $parent_uri );
</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"> public function data_theme_files() {
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestserverphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/rest-api/rest-server.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-server.php 2022-06-01 14:16:39 UTC (rev 53454)
+++ trunk/tests/phpunit/tests/rest-api/rest-server.php 2022-06-01 18:12:25 UTC (rev 53455)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1239,7 +1239,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = rest_get_server()->serve_request( '/' );
</span><span class="cx" style="display: block; padding: 0 10px"> $headers = rest_get_server()->sent_headers;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( '<' . esc_url_raw( $api_root ) . '>; rel="https://api.w.org/"', $headers['Link'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( '<' . sanitize_url( $api_root ) . '>; rel="https://api.w.org/"', $headers['Link'] );
</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"> public function test_nocache_headers_on_authenticated_requests() {
</span></span></pre>
</div>
</div>
</body>
</html>