<!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>[54555] branches/5.6: Grouped backports to the 5.6 branch.</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/54555">54555</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/54555","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>audrasjb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-10-17 17:56:34 +0000 (Mon, 17 Oct 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'>Grouped backports to the 5.6 branch. 

- Editor: Bump @wordpress packages for the branch,
- Media: Refactor search by filename within the admin,
- REST API: Lockdown post parameter of the terms endpoint,
- Customize: Escape blogname option in underscores templates,
- Query: Validate relation in `WP_Date_Query`,
- Posts, Post types: Apply KSES to post-by-email content,
- General: Validate host on "Are you sure?" screen,
- Posts, Post types: Remove emails from post-by-email logs,
- Pings/trackbacks: Apply KSES to all trackbacks,
- Mail: Reset PHPMailer properties between use,
- Comments: Apply kses when editing comments,
- Widgets: Escape RSS error messages for display.

Merges [54521-54530] to the 5.6 branch.
Props audrasjb, costdev, cu121, dd32, davidbaumwald, ehtis, johnbillion, johnjamesjacoby, martinkrcho, matveb, oztaser, paulkevan, peterwilsoncc, ravipatel, SergeyBiryukov, talldanwp, timothyblynjacobs, tykoted, voldemortensen, vortfu, xknown.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches56srcwpadminincludesajaxactionsphp">branches/5.6/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#branches56srcwpadminincludespostphp">branches/5.6/src/wp-admin/includes/post.php</a></li>
<li><a href="#branches56srcwpincludesclasswpdatequeryphp">branches/5.6/src/wp-includes/class-wp-date-query.php</a></li>
<li><a href="#branches56srcwpincludesclasswpqueryphp">branches/5.6/src/wp-includes/class-wp-query.php</a></li>
<li><a href="#branches56srcwpincludescommentphp">branches/5.6/src/wp-includes/comment.php</a></li>
<li><a href="#branches56srcwpincludescustomizeclasswpcustomizeheaderimagecontrolphp">branches/5.6/src/wp-includes/customize/class-wp-customize-header-image-control.php</a></li>
<li><a href="#branches56srcwpincludescustomizeclasswpcustomizesiteiconcontrolphp">branches/5.6/src/wp-includes/customize/class-wp-customize-site-icon-control.php</a></li>
<li><a href="#branches56srcwpincludesdeprecatedphp">branches/5.6/src/wp-includes/deprecated.php</a></li>
<li><a href="#branches56srcwpincludesfunctionsphp">branches/5.6/src/wp-includes/functions.php</a></li>
<li><a href="#branches56srcwpincludesmediatemplatephp">branches/5.6/src/wp-includes/media-template.php</a></li>
<li><a href="#branches56srcwpincludespluggablephp">branches/5.6/src/wp-includes/pluggable.php</a></li>
<li><a href="#branches56srcwpincludespostphp">branches/5.6/src/wp-includes/post.php</a></li>
<li><a href="#branches56srcwpincludesrestapiendpointsclasswprestattachmentscontrollerphp">branches/5.6/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php</a></li>
<li><a href="#branches56srcwpincludesrestapiendpointsclasswpresttermscontrollerphp">branches/5.6/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php</a></li>
<li><a href="#branches56srcwpincludeswidgetsphp">branches/5.6/src/wp-includes/widgets.php</a></li>
<li><a href="#branches56srcwpmailphp">branches/5.6/src/wp-mail.php</a></li>
<li><a href="#branches56srcwptrackbackphp">branches/5.6/src/wp-trackback.php</a></li>
<li><a href="#branches56testsphpunittestsquerysearchphp">branches/5.6/tests/phpunit/tests/query/search.php</a></li>
<li><a href="#branches56testsphpunittestsrestapirestcommentscontrollerphp">branches/5.6/tests/phpunit/tests/rest-api/rest-comments-controller.php</a></li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#branches56">branches/5.6/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/5.6
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/5.6 2022-10-17 17:55:03 UTC (rev 54554)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/5.6  2022-10-17 17:56:34 UTC (rev 54555)
</ins><a id="branches56"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/5.6</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:43557,43622
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:49645,49649-49651,49668,49673-49674,49677,49681,49685,49691,49702-49705,49708-49710,49713,49716,49718,49720,49722,49725-49726,49731,49736-49737,49739,49741,49744,49746,49751-49752,49759,49761-49764,49770,49772,49774,49779,49781-49784,49786,49791,49793-49795,49798-49801,49803-49805,49807,49823,49825-49826,49836,49838,49854,49860,49864-49866,49870,49872-49873,49876,49911,49913,49917,49919-49922,49938,49951-49952,49979,50003,50006,50035,50037,50039,50041,50049,50051,50053,50055,50058,50126,50176,50185,50192,50232,50267-50268,50285,50298-50299,50355,50379,50387,50413,50416,50432,50435-50436,50441-50446,50473-50474,50476,50479,50485-50487,50545,50579,50590,50592,50598,50670,50704,50714,50717,50796,50799,50930,50940-50941,50984-50985,51341,51355,51426,51498,51511,51535,51559-51560,51740,51810-51813,51828,51883,51921,51924-51925,51937,52002,52130,52183,52233,52412,52454-52457,52844,53112
 ,53581-53582,53592,53958-53960,54217,54322
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:49645,49649-49651,49668,49673-49674,49677,49681,49685,49691,49702-49705,49708-49710,49713,49716,49718,49720,49722,49725-49726,49731,49736-49737,49739,49741,49744,49746,49751-49752,49759,49761-49764,49770,49772,49774,49779,49781-49784,49786,49791,49793-49795,49798-49801,49803-49805,49807,49823,49825-49826,49836,49838,49854,49860,49864-49866,49870,49872-49873,49876,49911,49913,49917,49919-49922,49938,49951-49952,49979,50003,50006,50035,50037,50039,50041,50049,50051,50053,50055,50058,50126,50176,50185,50192,50232,50267-50268,50285,50298-50299,50355,50379,50387,50413,50416,50432,50435-50436,50441-50446,50473-50474,50476,50479,50485-50487,50545,50579,50590,50592,50598,50670,50704,50714,50717,50796,50799,50930,50940-50941,50984-50985,51341,51355,51426,51498,51511,51535,51559-51560,51740,51810-51813,51828,51883,51921,51924-51925,51937,52002,52130,52183,52233,52412,52454-52457,52844,53112
 ,53581-53582,53592,53958-53960,54217,54322,54521-54530,54541
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches56srcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-admin/includes/ajax-actions.php       2022-10-17 17:55:03 UTC (rev 54554)
+++ branches/5.6/src/wp-admin/includes/ajax-actions.php 2022-10-17 17:56:34 UTC (rev 54555)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2975,7 +2975,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        // Filter query clauses to include filenames.
</span><span class="cx" style="display: block; padding: 0 10px">        if ( isset( $query['s'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
</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="branches56srcwpadminincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-admin/includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-admin/includes/post.php       2022-10-17 17:55:03 UTC (rev 54554)
+++ branches/5.6/src/wp-admin/includes/post.php 2022-10-17 17:56:34 UTC (rev 54555)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1269,7 +1269,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        // Filter query clauses to include filenames.
</span><span class="cx" style="display: block; padding: 0 10px">        if ( isset( $q['s'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
</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 $q;
</span></span></pre></div>
<a id="branches56srcwpincludesclasswpdatequeryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-includes/class-wp-date-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-includes/class-wp-date-query.php      2022-10-17 17:55:03 UTC (rev 54554)
+++ branches/5.6/src/wp-includes/class-wp-date-query.php        2022-10-17 17:56:34 UTC (rev 54555)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,8 +149,8 @@
</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">-                if ( isset( $date_query['relation'] ) && 'OR' === strtoupper( $date_query['relation'] ) ) {
-                       $this->relation = 'OR';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( isset( $date_query['relation'] ) ) {
+                       $this->relation = $this->sanitize_relation( $date_query['relation'] );
</ins><span class="cx" style="display: block; padding: 0 10px">                 } else {
</span><span class="cx" style="display: block; padding: 0 10px">                        $this->relation = 'AND';
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,6 +219,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $this->validate_date_values( $queries );
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // Sanitize the relation parameter.
+               $queries['relation'] = $this->sanitize_relation( $queries['relation'] );
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 foreach ( $queries as $key => $q ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! is_array( $q ) || in_array( $key, $this->time_keys, true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                // This is a first-order query. Trust the values and sanitize when building SQL.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1039,4 +1042,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                return $wpdb->prepare( "DATE_FORMAT( $column, %s ) $compare %f", $format, $time );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+       /**
+        * Sanitizes a 'relation' operator.
+        *
+        * @since 6.0.3
+        *
+        * @param string $relation Raw relation key from the query argument.
+        * @return string Sanitized relation ('AND' or 'OR').
+        */
+       public function sanitize_relation( $relation ) {
+               if ( 'OR' === strtoupper( $relation ) ) {
+                       return 'OR';
+               } else {
+                       return 'AND';
+               }
+       }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches56srcwpincludesclasswpqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-includes/class-wp-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-includes/class-wp-query.php   2022-10-17 17:55:03 UTC (rev 54554)
+++ branches/5.6/src/wp-includes/class-wp-query.php     2022-10-17 17:56:34 UTC (rev 54555)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -442,6 +442,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">        public $thumbnails_cached = false;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * Controls whether an attachment query should include filenames or not.
+        *
+        * @since 6.0.3
+        * @var bool
+        */
+       protected $allow_query_attachment_by_filename = false;
+       /**
</ins><span class="cx" style="display: block; padding: 0 10px">          * Cached list of search stopwords.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @since 3.7.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1391,7 +1398,12 @@
</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">                        $like      = $n . $wpdb->esc_like( $term ) . $n;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $search   .= $wpdb->prepare( "{$searchand}(({$wpdb->posts}.post_title $like_op %s) $andor_op ({$wpdb->posts}.post_excerpt $like_op %s) $andor_op ({$wpdb->posts}.post_content $like_op %s))", $like, $like, $like );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+                       if ( ! empty( $this->allow_query_attachment_by_filename ) ) {
+                               $search .= $wpdb->prepare( "{$searchand}(({$wpdb->posts}.post_title $like_op %s) $andor_op ({$wpdb->posts}.post_excerpt $like_op %s) $andor_op ({$wpdb->posts}.post_content $like_op %s) $andor_op (sq1.meta_value $like_op %s))", $like, $like, $like, $like );
+                       } else {
+                               $search .= $wpdb->prepare( "{$searchand}(({$wpdb->posts}.post_title $like_op %s) $andor_op ({$wpdb->posts}.post_excerpt $like_op %s) $andor_op ({$wpdb->posts}.post_content $like_op %s))", $like, $like, $like );
+                       }
</ins><span class="cx" style="display: block; padding: 0 10px">                         $searchand = ' AND ';
</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">@@ -1784,6 +1796,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">                // Fill again in case 'pre_get_posts' unset some vars.
</span><span class="cx" style="display: block; padding: 0 10px">                $q = $this->fill_query_vars( $q );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                /**
+                * Filters whether an attachment query should include filenames or not.
+                *
+                * @since 6.0.3
+                *
+                * @param bool $allow_query_attachment_by_filename Whether or not to include filenames.
+                */
+               $this->allow_query_attachment_by_filename = apply_filters( 'wp_allow_query_attachment_by_filename', false );
+               remove_all_filters( 'wp_allow_query_attachment_by_filename' );
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 // Parse meta query.
</span><span class="cx" style="display: block; padding: 0 10px">                $this->meta_query = new WP_Meta_Query();
</span><span class="cx" style="display: block; padding: 0 10px">                $this->meta_query->parse_query_vars( $q );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2215,7 +2237,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">-                if ( ! empty( $this->tax_query->queries ) || ! empty( $this->meta_query->queries ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ! empty( $this->tax_query->queries ) || ! empty( $this->meta_query->queries ) || ! empty( $this->allow_query_attachment_by_filename ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         $groupby = "{$wpdb->posts}.ID";
</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">@@ -2292,6 +2314,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px">                $where .= $search . $whichauthor . $whichmimetype;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                if ( ! empty( $this->allow_query_attachment_by_filename ) ) {
+                       $join .= " LEFT JOIN {$wpdb->postmeta} AS sq1 ON ( {$wpdb->posts}.ID = sq1.post_id AND sq1.meta_key = '_wp_attached_file' )";
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! empty( $this->meta_query->queries ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        $clauses = $this->meta_query->get_sql( 'post', $wpdb->posts, 'ID', $this );
</span><span class="cx" style="display: block; padding: 0 10px">                        $join   .= $clauses['join'];
</span></span></pre></div>
<a id="branches56srcwpincludescommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-includes/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-includes/comment.php  2022-10-17 17:55:03 UTC (rev 54554)
+++ branches/5.6/src/wp-includes/comment.php    2022-10-17 17:56:34 UTC (rev 54555)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2459,6 +2459,15 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        $filter_comment = false;
+       if ( ! has_filter( 'pre_comment_content', 'wp_filter_kses' ) ) {
+               $filter_comment = ! user_can( isset( $comment['user_id'] ) ? $comment['user_id'] : 0, 'unfiltered_html' );
+       }
+
+       if ( $filter_comment ) {
+               add_filter( 'pre_comment_content', 'wp_filter_kses' );
+       }
+
</ins><span class="cx" style="display: block; padding: 0 10px">         // Escape data pulled from DB.
</span><span class="cx" style="display: block; padding: 0 10px">        $comment = wp_slash( $comment );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2469,6 +2478,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        $commentarr = wp_filter_comment( $commentarr );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        if ( $filter_comment ) {
+               remove_filter( 'pre_comment_content', 'wp_filter_kses' );
+       }
+
</ins><span class="cx" style="display: block; padding: 0 10px">         // Now extract the merged array.
</span><span class="cx" style="display: block; padding: 0 10px">        $data = wp_unslash( $commentarr );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="branches56srcwpincludescustomizeclasswpcustomizeheaderimagecontrolphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-includes/customize/class-wp-customize-header-image-control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-includes/customize/class-wp-customize-header-image-control.php        2022-10-17 17:55:03 UTC (rev 54554)
+++ branches/5.6/src/wp-includes/customize/class-wp-customize-header-image-control.php  2022-10-17 17:56:34 UTC (rev 54555)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,10 +130,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        <# } else { #>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        <button type="button" class="choice thumbnail"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                data-customize-image-value="{{{data.header.url}}}"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         data-customize-image-value="{{data.header.url}}"
</ins><span class="cx" style="display: block; padding: 0 10px">                                 data-customize-header-image-data="{{JSON.stringify(data.header)}}">
</span><span class="cx" style="display: block; padding: 0 10px">                                <span class="screen-reader-text"><?php _e( 'Set image' ); ?></span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <img src="{{{data.header.thumbnail_url}}}" alt="{{{data.header.alt_text || data.header.description}}}" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <img src="{{data.header.thumbnail_url}}" alt="{{data.header.alt_text || data.header.description}}" />
</ins><span class="cx" style="display: block; padding: 0 10px">                         </button>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        <# if ( data.type === 'uploaded' ) { #>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,7 +158,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                <# } else { #>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <img src="{{{data.header.thumbnail_url}}}" alt="{{{data.header.alt_text || data.header.description}}}" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <img src="{{data.header.thumbnail_url}}" alt="{{data.header.alt_text || data.header.description}}" />
</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">                        <# } else { #>
</span></span></pre></div>
<a id="branches56srcwpincludescustomizeclasswpcustomizesiteiconcontrolphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-includes/customize/class-wp-customize-site-icon-control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-includes/customize/class-wp-customize-site-icon-control.php   2022-10-17 17:55:03 UTC (rev 54554)
+++ branches/5.6/src/wp-includes/customize/class-wp-customize-site-icon-control.php     2022-10-17 17:56:34 UTC (rev 54555)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,7 +68,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                        <div class="favicon">
</span><span class="cx" style="display: block; padding: 0 10px">                                                                <img src="{{ data.attachment.sizes.full ? data.attachment.sizes.full.url : data.attachment.url }}" alt="<?php esc_attr_e( 'Preview as a browser icon' ); ?>"/>
</span><span class="cx" style="display: block; padding: 0 10px">                                                        </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        <span class="browser-title" aria-hidden="true"><# print( '<?php bloginfo( 'name' ); ?>' ) #></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 <span class="browser-title" aria-hidden="true"><# print( '<?php echo esc_js( get_bloginfo( 'name' ) ); ?>' ) #></span>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 </div>
</span><span class="cx" style="display: block; padding: 0 10px">                                                <img class="app-icon-preview" src="{{ data.attachment.sizes.full ? data.attachment.sizes.full.url : data.attachment.url }}" alt="<?php esc_attr_e( 'Preview as an app icon' ); ?>"/>
</span><span class="cx" style="display: block; padding: 0 10px">                                        </div>
</span></span></pre></div>
<a id="branches56srcwpincludesdeprecatedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-includes/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-includes/deprecated.php       2022-10-17 17:55:03 UTC (rev 54554)
+++ branches/5.6/src/wp-includes/deprecated.php 2022-10-17 17:56:34 UTC (rev 54555)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4135,3 +4135,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function addslashes_strings_only( $value ) {
</span><span class="cx" style="display: block; padding: 0 10px">        return is_string( $value ) ? addslashes( $value ) : $value;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Filter the SQL clauses of an attachment query to include filenames.
+ *
+ * @since 4.7.0
+ * @deprecated 6.0.3
+ * @access private
+ *
+ * @param array $clauses An array including WHERE, GROUP BY, JOIN, ORDER BY,
+ *                       DISTINCT, fields (SELECT), and LIMITS clauses.
+ * @return array The unmodified clauses.
+ */
+function _filter_query_attachment_filenames( $clauses ) {
+       _deprecated_function( __FUNCTION__, '6.0.3', 'add_filter( "wp_allow_query_attachment_by_filename", "__return_true" )');
+       remove_filter( 'posts_clauses', __FUNCTION__ );
+       return $clauses;
+}
+
</ins></span></pre></div>
<a id="branches56srcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-includes/functions.php        2022-10-17 17:55:03 UTC (rev 54554)
+++ branches/5.6/src/wp-includes/functions.php  2022-10-17 17:56:34 UTC (rev 54555)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3287,10 +3287,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">        } else {
</span><span class="cx" style="display: block; padding: 0 10px">                $html = __( 'The link you followed has expired.' );
</span><span class="cx" style="display: block; padding: 0 10px">                if ( wp_get_referer() ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        $wp_http_referer = remove_query_arg( 'updated', wp_get_referer() );
+                       $wp_http_referer = wp_validate_redirect( esc_url_raw( $wp_http_referer ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                         $html .= '</p><p>';
</span><span class="cx" style="display: block; padding: 0 10px">                        $html .= sprintf(
</span><span class="cx" style="display: block; padding: 0 10px">                                '<a href="%s">%s</a>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                esc_url( remove_query_arg( 'updated', wp_get_referer() ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         esc_url( $wp_http_referer ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                 __( 'Please try again.' )
</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="branches56srcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-includes/media-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-includes/media-template.php   2022-10-17 17:55:03 UTC (rev 54554)
+++ branches/5.6/src/wp-includes/media-template.php     2022-10-17 17:56:34 UTC (rev 54555)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1493,7 +1493,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="favicon">
</span><span class="cx" style="display: block; padding: 0 10px">                                <img id="preview-favicon" src="{{ data.url }}" alt="<?php esc_attr_e( 'Preview as a browser icon' ); ?>"/>
</span><span class="cx" style="display: block; padding: 0 10px">                        </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <span class="browser-title" aria-hidden="true"><# print( '<?php bloginfo( 'name' ); ?>' ) #></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <span class="browser-title" aria-hidden="true"><# print( '<?php echo esc_js( get_bloginfo( 'name' ) ); ?>' ) #></span>
</ins><span class="cx" style="display: block; padding: 0 10px">                 </div>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                <strong aria-hidden="true"><?php _e( 'As an app icon' ); ?></strong>
</span></span></pre></div>
<a id="branches56srcwpincludespluggablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-includes/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-includes/pluggable.php        2022-10-17 17:55:03 UTC (rev 54554)
+++ branches/5.6/src/wp-includes/pluggable.php  2022-10-17 17:56:34 UTC (rev 54555)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -317,6 +317,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $phpmailer->clearAttachments();
</span><span class="cx" style="display: block; padding: 0 10px">                $phpmailer->clearCustomHeaders();
</span><span class="cx" style="display: block; padding: 0 10px">                $phpmailer->clearReplyTos();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $phpmailer->Body    = '';
+               $phpmailer->AltBody = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Set "From" name and email.
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="branches56srcwpincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-includes/post.php     2022-10-17 17:55:03 UTC (rev 54554)
+++ branches/5.6/src/wp-includes/post.php       2022-10-17 17:56:34 UTC (rev 54555)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1987,6 +1987,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @since 4.4.0
</span><span class="cx" style="display: block; padding: 0 10px">  * @since 4.5.0 Added the ability to pass a post type name in addition to object.
</span><span class="cx" style="display: block; padding: 0 10px">  * @since 4.6.0 Converted the `$post_type` parameter to accept a `WP_Post_Type` object.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.9.0 Added `is_post_type_viewable` hook to filter the result.
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @param string|WP_Post_Type $post_type Post type name or object.
</span><span class="cx" style="display: block; padding: 0 10px">  * @return bool Whether the post type should be considered viewable.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1994,15 +1995,108 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function is_post_type_viewable( $post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_scalar( $post_type ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                $post_type = get_post_type_object( $post_type );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $post_type ) {
</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><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        return $post_type->publicly_queryable || ( $post_type->_builtin && $post_type->public );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_object( $post_type ) ) {
+               return false;
+       }
+
+       $is_viewable = $post_type->publicly_queryable || ( $post_type->_builtin && $post_type->public );
+
+       /**
+        * Filters whether a post type is considered "viewable".
+        *
+        * The returned filtered value must be a boolean type to ensure
+        * `is_post_type_viewable()` only returns a boolean. This strictness
+        * is by design to maintain backwards-compatibility and guard against
+        * potential type errors in PHP 8.1+. Non-boolean values (even falsey
+        * and truthy values) will result in the function returning false.
+        *
+        * @since 5.9.0
+        *
+        * @param bool         $is_viewable Whether the post type is "viewable" (strict type).
+        * @param WP_Post_Type $post_type   Post type object.
+        */
+       return true === apply_filters( 'is_post_type_viewable', $is_viewable, $post_type );
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Determines whether a post status is considered "viewable".
+ *
+ * For built-in post statuses such as publish and private, the 'public' value will be evaluated.
+ * For all others, the 'publicly_queryable' value will be used.
+ *
+ * @since 5.7.0
+ * @since 5.9.0 Added `is_post_status_viewable` hook to filter the result.
+ *
+ * @param string|stdClass $post_status Post status name or object.
+ * @return bool Whether the post status should be considered viewable.
+ */
+function is_post_status_viewable( $post_status ) {
+       if ( is_scalar( $post_status ) ) {
+               $post_status = get_post_status_object( $post_status );
+
+               if ( ! $post_status ) {
+                       return false;
+               }
+       }
+
+       if (
+               ! is_object( $post_status ) ||
+               $post_status->internal ||
+               $post_status->protected
+       ) {
+               return false;
+       }
+
+       $is_viewable = $post_status->publicly_queryable || ( $post_status->_builtin && $post_status->public );
+
+       /**
+        * Filters whether a post status is considered "viewable".
+        *
+        * The returned filtered value must be a boolean type to ensure
+        * `is_post_status_viewable()` only returns a boolean. This strictness
+        * is by design to maintain backwards-compatibility and guard against
+        * potential type errors in PHP 8.1+. Non-boolean values (even falsey
+        * and truthy values) will result in the function returning false.
+        *
+        * @since 5.9.0
+        *
+        * @param bool     $is_viewable Whether the post status is "viewable" (strict type).
+        * @param stdClass $post_status Post status object.
+        */
+       return true === apply_filters( 'is_post_status_viewable', $is_viewable, $post_status );
+}
+
+/**
+ * Determines whether a post is publicly viewable.
+ *
+ * Posts are considered publicly viewable if both the post status and post type
+ * are viewable.
+ *
+ * @since 5.7.0
+ *
+ * @param int|WP_Post|null $post Optional. Post ID or post object. Defaults to global $post.
+ * @return bool Whether the post is publicly viewable.
+ */
+function is_post_publicly_viewable( $post = null ) {
+       $post = get_post( $post );
+
+       if ( ! $post ) {
+               return false;
+       }
+
+       $post_type   = get_post_type( $post );
+       $post_status = get_post_status( $post );
+
+       return is_post_type_viewable( $post_type ) && is_post_status_viewable( $post_status );
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px">  * Retrieves an array of the latest posts, or posts matching the given criteria.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * The defaults are as follows:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7475,36 +7569,6 @@
</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">- * Filters the SQL clauses of an attachment query to include filenames.
- *
- * @since 4.7.0
- * @access private
- *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
- * @param string[] $clauses An array including WHERE, GROUP BY, JOIN, ORDER BY,
- *                          DISTINCT, fields (SELECT), and LIMITS clauses.
- * @return string[] The modified array of clauses.
- */
-function _filter_query_attachment_filenames( $clauses ) {
-       global $wpdb;
-       remove_filter( 'posts_clauses', __FUNCTION__ );
-
-       // Add a LEFT JOIN of the postmeta table so we don't trample existing JOINs.
-       $clauses['join'] .= " LEFT JOIN {$wpdb->postmeta} AS sq1 ON ( {$wpdb->posts}.ID = sq1.post_id AND sq1.meta_key = '_wp_attached_file' )";
-
-       $clauses['groupby'] = "{$wpdb->posts}.ID";
-
-       $clauses['where'] = preg_replace(
-               "/\({$wpdb->posts}.post_content (NOT LIKE|LIKE) (\'[^']+\')\)/",
-               '$0 OR ( sq1.meta_value $1 $2 )',
-               $clauses['where']
-       );
-
-       return $clauses;
-}
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px">  * Sets the last changed time for the 'posts' cache group.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @since 5.0.0
</span></span></pre></div>
<a id="branches56srcwpincludesrestapiendpointsclasswprestattachmentscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php  2022-10-17 17:55:03 UTC (rev 54554)
+++ branches/5.6/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php    2022-10-17 17:56:34 UTC (rev 54555)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +89,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Filter query clauses to include filenames.
</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $query_args['s'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
</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 $query_args;
</span></span></pre></div>
<a id="branches56srcwpincludesrestapiendpointsclasswpresttermscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php        2022-10-17 17:55:03 UTC (rev 54554)
+++ branches/5.6/src/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php  2022-10-17 17:56:34 UTC (rev 54555)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,6 +135,35 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * Checks if the terms for a post can be read.
+        *
+        * @since 6.0.3
+        *
+        * @param WP_Post         $post    Post object.
+        * @param WP_REST_Request $request Full details about the request.
+        * @return bool Whether the terms for the post can be read.
+        */
+       public function check_read_terms_permission_for_post( $post, $request ) {
+               // If the requested post isn't associated with this taxonomy, deny access.
+               if ( ! is_object_in_taxonomy( $post->post_type, $this->taxonomy ) ) {
+                       return false;
+               }
+
+               // Grant access if the post is publicly viewable.
+               if ( is_post_publicly_viewable( $post ) ) {
+                       return true;
+               }
+
+               // Otherwise grant access if the post is readable by the logged in user.
+               if ( current_user_can( 'read_post', $post->ID ) ) {
+                       return true;
+               }
+
+               // Otherwise, deny access.
+               return false;
+       }
+
+       /**
</ins><span class="cx" style="display: block; padding: 0 10px">          * Checks if a request has access to read terms in the specified taxonomy.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @since 4.7.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,6 +186,30 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                if ( ! empty( $request['post'] ) ) {
+                       $post = get_post( $request['post'] );
+
+                       if ( ! $post ) {
+                               return new WP_Error(
+                                       'rest_post_invalid_id',
+                                       __( 'Invalid post ID.' ),
+                                       array(
+                                               'status' => 400,
+                                       )
+                               );
+                       }
+
+                       if ( ! $this->check_read_terms_permission_for_post( $post, $request ) ) {
+                               return new WP_Error(
+                                       'rest_forbidden_context',
+                                       __( 'Sorry, you are not allowed to view terms for this post.' ),
+                                       array(
+                                               'status' => rest_authorization_required_code(),
+                                       )
+                               );
+                       }
+               }
+
</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="branches56srcwpincludeswidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-includes/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-includes/widgets.php  2022-10-17 17:55:03 UTC (rev 54554)
+++ branches/5.6/src/wp-includes/widgets.php    2022-10-17 17:56:34 UTC (rev 54555)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1522,7 +1522,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        if ( is_wp_error( $rss ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                if ( is_admin() || current_user_can( 'manage_options' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        echo '<p><strong>' . __( 'RSS Error:' ) . '</strong> ' . $rss->get_error_message() . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 echo '<p><strong>' . __( 'RSS Error:' ) . '</strong> ' . esc_html( $rss->get_error_message() ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px">                return;
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1645,7 +1645,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        $args['show_date']    = isset( $args['show_date'] ) ? (int) $args['show_date'] : (int) $inputs['show_date'];
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        if ( ! empty( $args['error'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                echo '<p class="widget-error"><strong>' . __( 'RSS Error:' ) . '</strong> ' . $args['error'] . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         echo '<p class="widget-error"><strong>' . __( 'RSS Error:' ) . '</strong> ' . esc_html( $args['error'] ) . '</p>';
</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">        $esc_number = esc_attr( $args['number'] );
</span></span></pre></div>
<a id="branches56srcwpmailphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-mail.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-mail.php      2022-10-17 17:55:03 UTC (rev 54554)
+++ branches/5.6/src/wp-mail.php        2022-10-17 17:56:34 UTC (rev 54555)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,6 +65,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">        wp_die( __( 'There doesn&#8217;t seem to be any new mail.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Always run as an unauthenticated user.
+wp_set_current_user( 0 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 1; $i <= $count; $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        $message = $pop3->get( $i );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,8 +134,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                }
</span><span class="cx" style="display: block; padding: 0 10px">                                $author = sanitize_email( $author );
</span><span class="cx" style="display: block; padding: 0 10px">                                if ( is_email( $author ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        /* translators: %s: Post author email address. */
-                                       echo '<p>' . sprintf( __( 'Author is %s' ), $author ) . '</p>';
</del><span class="cx" style="display: block; padding: 0 10px">                                         $userdata = get_user_by( 'email', $author );
</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( ! empty( $userdata ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                                $post_author  = $userdata->ID;
</span></span></pre></div>
<a id="branches56srcwptrackbackphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-trackback.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-trackback.php 2022-10-17 17:55:03 UTC (rev 54554)
+++ branches/5.6/src/wp-trackback.php   2022-10-17 17:56:34 UTC (rev 54555)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,6 +13,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">        wp( array( 'tb' => '1' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Always run as an unauthenticated user.
+wp_set_current_user( 0 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * Response to a trackback.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span></span></pre></div>
<a id="branches56testsphpunittestsquerysearchphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/tests/phpunit/tests/query/search.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/tests/phpunit/tests/query/search.php 2022-10-17 17:55:03 UTC (rev 54554)
+++ branches/5.6/tests/phpunit/tests/query/search.php   2022-10-17 17:56:34 UTC (rev 54555)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -455,7 +455,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">                add_post_meta( $attachment, '_wp_attached_file', 'some-image1.png', true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Pass post_type a string value.
</span><span class="cx" style="display: block; padding: 0 10px">                $q = new WP_Query(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -485,7 +485,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">                add_post_meta( $attachment, '_wp_attached_file', 'some-image2.png', true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Pass post_type an array value.
</span><span class="cx" style="display: block; padding: 0 10px">                $q = new WP_Query(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -544,7 +544,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                add_post_meta( $attachment, '_wp_attached_file', 'some-image4.png', true );
</span><span class="cx" style="display: block; padding: 0 10px">                add_post_meta( $attachment, '_test_meta_key', 'value', true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Pass post_type a string value.
</span><span class="cx" style="display: block; padding: 0 10px">                $q = new WP_Query(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -584,7 +584,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_post_terms( $attachment, 'test', 'post_tag' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                add_post_meta( $attachment, '_wp_attached_file', 'some-image5.png', true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Pass post_type a string value.
</span><span class="cx" style="display: block; padding: 0 10px">                $q = new WP_Query(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -609,25 +609,37 @@
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="cx" style="display: block; padding: 0 10px">         * @ticket 22744
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        public function test_filter_query_attachment_filenames_unhooks_itself() {
-               add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_query_removes_filter_wp_allow_query_attachment_by_filename() {
+               $attachment = self::factory()->post->create(
+                       array(
+                               'post_type'    => 'attachment',
+                               'post_status'  => 'publish',
+                               'post_title'   => 'bar foo',
+                               'post_content' => 'foo bar',
+                               'post_excerpt' => 'This post has foo',
+                       )
+               );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                apply_filters(
-                       'posts_clauses',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         add_post_meta( $attachment, '_wp_attached_file', 'some-image1.png', true );
+               add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
+
+               $q = new WP_Query(
</ins><span class="cx" style="display: block; padding: 0 10px">                         array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'where'    => '',
-                               'groupby'  => '',
-                               'join'     => '',
-                               'orderby'  => '',
-                               'distinct' => '',
-                               'fields'   => '',
-                               'limit'    => '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         's'           => 'image1',
+                               'fields'      => 'ids',
+                               'post_type'   => 'attachment',
+                               'post_status' => 'inherit',
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $result = has_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSame( array( $attachment ), $q->posts );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertFalse( $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*
+                * WP_Query should have removed the wp_allow_query_attachment_by_filename filter
+                * and thus not match the attachment created above
+                */
+               $q->get_posts();
+               $this->assertEmpty( $q->posts );
</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 filter_posts_search( $sql ) {
</span></span></pre></div>
<a id="branches56testsphpunittestsrestapirestcommentscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/tests/phpunit/tests/rest-api/rest-comments-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/tests/phpunit/tests/rest-api/rest-comments-controller.php    2022-10-17 17:55:03 UTC (rev 54554)
+++ branches/5.6/tests/phpunit/tests/rest-api/rest-comments-controller.php      2022-10-17 17:56:34 UTC (rev 54555)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2972,6 +2972,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        'content'           => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px">                                        'author_name'       => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px">                                        'author_user_agent' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        'author'            => self::$editor_id,
</ins><span class="cx" style="display: block; padding: 0 10px">                                 ),
</span><span class="cx" style="display: block; padding: 0 10px">                                array(
</span><span class="cx" style="display: block; padding: 0 10px">                                        'content'           => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2980,6 +2981,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        ),
</span><span class="cx" style="display: block; padding: 0 10px">                                        'author_name'       => 'div strong',
</span><span class="cx" style="display: block; padding: 0 10px">                                        'author_user_agent' => 'div strong',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        'author'            => self::$editor_id,
</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">                } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2989,6 +2991,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        'content'           => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px">                                        'author_name'       => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px">                                        'author_user_agent' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        'author'            => self::$editor_id,
</ins><span class="cx" style="display: block; padding: 0 10px">                                 ),
</span><span class="cx" style="display: block; padding: 0 10px">                                array(
</span><span class="cx" style="display: block; padding: 0 10px">                                        'content'           => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2997,6 +3000,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        ),
</span><span class="cx" style="display: block; padding: 0 10px">                                        'author_name'       => 'div strong',
</span><span class="cx" style="display: block; padding: 0 10px">                                        'author_user_agent' => 'div strong',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        'author'            => self::$editor_id,
</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">@@ -3011,6 +3015,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                'content'           => '\\\&\\\ &amp; &invalid; < &lt; &amp;lt;',
</span><span class="cx" style="display: block; padding: 0 10px">                                'author_name'       => '\\\&\\\ &amp; &invalid; < &lt; &amp;lt;',
</span><span class="cx" style="display: block; padding: 0 10px">                                'author_user_agent' => '\\\&\\\ &amp; &invalid; < &lt; &amp;lt;',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                'author'            => self::$superadmin_id,
</ins><span class="cx" style="display: block; padding: 0 10px">                         ),
</span><span class="cx" style="display: block; padding: 0 10px">                        array(
</span><span class="cx" style="display: block; padding: 0 10px">                                'content'           => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3019,6 +3024,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                ),
</span><span class="cx" style="display: block; padding: 0 10px">                                'author_name'       => '\\\&amp;\\\ &amp; &amp;invalid; &lt; &lt; &amp;lt;',
</span><span class="cx" style="display: block; padding: 0 10px">                                'author_user_agent' => '\\\&\\\ &amp; &invalid; &lt; &lt; &amp;lt;',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                'author'            => self::$superadmin_id,
</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">@@ -3032,6 +3038,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                'content'           => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px">                                'author_name'       => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><span class="cx" style="display: block; padding: 0 10px">                                'author_user_agent' => '<div>div</div> <strong>strong</strong> <script>oh noes</script>',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                'author'            => self::$superadmin_id,
</ins><span class="cx" style="display: block; padding: 0 10px">                         ),
</span><span class="cx" style="display: block; padding: 0 10px">                        array(
</span><span class="cx" style="display: block; padding: 0 10px">                                'content'           => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3040,6 +3047,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                ),
</span><span class="cx" style="display: block; padding: 0 10px">                                'author_name'       => 'div strong',
</span><span class="cx" style="display: block; padding: 0 10px">                                'author_user_agent' => 'div strong',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                'author'            => self::$superadmin_id,
</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>
</div>

</body>
</html>