<!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>[56178] trunk/src/wp-includes: Docs: Replace multiple single line comments with multi-line comments.</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/56178">56178</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/56178","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>2023-07-09 21:23:34 +0000 (Sun, 09 Jul 2023)</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'>Docs: Replace multiple single line comments with multi-line comments.
This changeset updates various comments as per WordPress PHP Inline Documentation Standards.
See https://developer.wordpress.org/coding-standards/inline-documentation-standards/php/<a href="https://core.trac.wordpress.org/ticket/5">#5</a>-inline-comments.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/56174">[56174]</a>, <a href="https://core.trac.wordpress.org/changeset/56175">[56175]</a>, <a href="https://core.trac.wordpress.org/changeset/56176">[56176]</a>, <a href="https://core.trac.wordpress.org/changeset/56177">[56177]</a>.
Props costdev, audrasjb.
See <a href="https://core.trac.wordpress.org/ticket/58459">#58459</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpimageeditorimagickphp">trunk/src/wp-includes/class-wp-image-editor-imagick.php</a></li>
<li><a href="#trunksrcwpincludesclasswpimageeditorphp">trunk/src/wp-includes/class-wp-image-editor.php</a></li>
<li><a href="#trunksrcwpincludesclasswplocaleswitcherphp">trunk/src/wp-includes/class-wp-locale-switcher.php</a></li>
<li><a href="#trunksrcwpincludesclasswplocalephp">trunk/src/wp-includes/class-wp-locale.php</a></li>
<li><a href="#trunksrcwpincludesclasswpoembedphp">trunk/src/wp-includes/class-wp-oembed.php</a></li>
<li><a href="#trunksrcwpincludesclasswpqueryphp">trunk/src/wp-includes/class-wp-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswptextdiffrenderertablephp">trunk/src/wp-includes/class-wp-text-diff-renderer-table.php</a></li>
<li><a href="#trunksrcwpincludesclasswptextdomainregistryphp">trunk/src/wp-includes/class-wp-textdomain-registry.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpimageeditorimagickphp"></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-image-editor-imagick.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-image-editor-imagick.php 2023-07-09 20:15:03 UTC (rev 56177)
+++ trunk/src/wp-includes/class-wp-image-editor-imagick.php 2023-07-09 21:23:34 UTC (rev 56178)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,8 +102,10 @@
</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">- // setIteratorIndex is optional unless mime is an animated format.
- // Here, we just say no if you are missing it and aren't loading a jpeg.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * setIteratorIndex is optional unless mime is an animated format.
+ * Here, we just say no if you are missing it and aren't loading a jpeg.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! method_exists( 'Imagick', 'setIteratorIndex' ) && 'image/jpeg' !== $mime_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="lines" style="display: block; padding: 0 10px; color: #888">@@ -602,8 +604,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->image->setImagePage( $src_w, $src_h, 0, 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $dst_w || $dst_h ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If destination width/height isn't specified,
- // use same as width/height from source.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If destination width/height isn't specified,
+ * use same as width/height from source.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $dst_w ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $dst_w = $src_w;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -957,8 +961,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function pdf_setup() {
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // By default, PDFs are rendered in a very low resolution.
- // We want the thumbnail to be readable, so increase the rendering DPI.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * By default, PDFs are rendered in a very low resolution.
+ * We want the thumbnail to be readable, so increase the rendering DPI.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->image->setResolution( 128, 128 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Only load the first page.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -986,12 +992,16 @@
</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"> try {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // When generating thumbnails from cropped PDF pages, Imagemagick uses the uncropped
- // area (resulting in unnecessary whitespace) unless the following option is set.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * When generating thumbnails from cropped PDF pages, Imagemagick uses the uncropped
+ * area (resulting in unnecessary whitespace) unless the following option is set.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->image->setOption( 'pdf:use-cropbox', true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Reading image after Imagick instantiation because `setResolution`
- // only applies correctly before the image is read.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Reading image after Imagick instantiation because `setResolution`
+ * only applies correctly before the image is read.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->image->readImage( $filename );
</span><span class="cx" style="display: block; padding: 0 10px"> } catch ( Exception $e ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Attempt to run `gs` without the `use-cropbox` option. See #48853.
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpimageeditorphp"></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-image-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-image-editor.php 2023-07-09 20:15:03 UTC (rev 56177)
+++ trunk/src/wp-includes/class-wp-image-editor.php 2023-07-09 21:23:34 UTC (rev 56178)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -349,8 +349,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $file_mime = $this->mime_type;
</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">- // Check to see if specified mime-type is the same as type implied by
- // file extension. If so, prefer extension from file.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Check to see if specified mime-type is the same as type implied by
+ * file extension. If so, prefer extension from file.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $mime_type || ( $file_mime == $mime_type ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $mime_type = $file_mime;
</span><span class="cx" style="display: block; padding: 0 10px"> $new_ext = $file_ext;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -384,8 +386,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $new_ext = $this->get_extension( $mime_type );
</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">- // Double-check that the mime-type selected is supported by the editor.
- // If not, choose a default instead.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Double-check that the mime-type selected is supported by the editor.
+ * If not, choose a default instead.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->supports_mime_type( $mime_type ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters default mime type prior to getting the file extension.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -400,9 +404,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $new_ext = $this->get_extension( $mime_type );
</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">- // Ensure both $filename and $new_ext are not empty.
- // $this->get_extension() returns false on error which would effectively remove the extension
- // from $filename. That shouldn't happen, files without extensions are not supported.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Ensure both $filename and $new_ext are not empty.
+ * $this->get_extension() returns false on error which would effectively remove the extension
+ * from $filename. That shouldn't happen, files without extensions are not supported.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $filename && $new_ext ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $dir = pathinfo( $filename, PATHINFO_DIRNAME );
</span><span class="cx" style="display: block; padding: 0 10px"> $ext = pathinfo( $filename, PATHINFO_EXTENSION );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -515,8 +521,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->flip( false, true );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 3:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Rotate 180 degrees or flip horizontally and vertically.
- // Flipping seems faster and uses less resources.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Rotate 180 degrees or flip horizontally and vertically.
+ * Flipping seems faster and uses less resources.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->flip( true, true );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 4:
</span></span></pre></div>
<a id="trunksrcwpincludesclasswplocaleswitcherphp"></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-locale-switcher.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-locale-switcher.php 2023-07-09 20:15:03 UTC (rev 56177)
+++ trunk/src/wp-includes/class-wp-locale-switcher.php 2023-07-09 21:23:34 UTC (rev 56178)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,8 +255,10 @@
</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">- // Unload current text domain but allow them to be reloaded
- // after switching back or to another locale.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Unload current text domain but allow them to be reloaded
+ * after switching back or to another locale.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> unload_textdomain( $domain, true );
</span><span class="cx" style="display: block; padding: 0 10px"> get_translations_for_domain( $domain );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswplocalephp"></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-locale.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-locale.php 2023-07-09 20:15:03 UTC (rev 56177)
+++ trunk/src/wp-includes/class-wp-locale.php 2023-07-09 21:23:34 UTC (rev 56178)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,8 +219,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->meridiem['AM'] = __( 'AM' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->meridiem['PM'] = __( 'PM' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Numbers formatting.
- // See https://www.php.net/number_format
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Numbers formatting.
+ * See https://www.php.net/number_format
+ */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: $thousands_sep argument for https://www.php.net/number_format, default is ',' */
</span><span class="cx" style="display: block; padding: 0 10px"> $thousands_sep = __( 'number_format_thousands_sep' );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpoembedphp"></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-oembed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-oembed.php 2023-07-09 20:15:03 UTC (rev 56177)
+++ trunk/src/wp-includes/class-wp-oembed.php 2023-07-09 21:23:34 UTC (rev 56178)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -620,9 +620,10 @@
</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 ( PHP_VERSION_ID < 80000 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // This function has been deprecated in PHP 8.0 because in libxml 2.9.0, external entity loading
- // is disabled by default, so this function is no longer needed to protect against XXE attacks.
- // phpcs:ignore PHPCompatibility.FunctionUse.RemovedFunctions.libxml_disable_entity_loaderDeprecated
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * This function has been deprecated in PHP 8.0 because in libxml 2.9.0, external entity loading
+ * is disabled by default, so this function is no longer needed to protect against XXE attacks.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $loader = libxml_disable_entity_loader( 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="trunksrcwpincludesclasswpqueryphp"></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-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-query.php 2023-07-09 20:15:03 UTC (rev 56177)
+++ trunk/src/wp-includes/class-wp-query.php 2023-07-09 21:23:34 UTC (rev 56178)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1616,8 +1616,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $search_orderby .= $wpdb->prepare( "WHEN {$wpdb->posts}.post_title LIKE %s THEN 1 ", $like );
</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">- // Sanity limit, sort as sentence when more than 6 terms
- // (few searches are longer than 6 terms and most titles are not).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Sanity limit, sort as sentence when more than 6 terms
+ * (few searches are longer than 6 terms and most titles are not).
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $num_terms < 7 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // All words in title.
</span><span class="cx" style="display: block; padding: 0 10px"> $search_orderby .= 'WHEN ' . implode( ' AND ', $q['search_orderby_title'] ) . ' THEN 2 ';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3509,8 +3511,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->posts = apply_filters_ref_array( 'the_posts', array( $this->posts, &$this ) );
</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">- // Ensure that any posts added/modified via one of the filters above are
- // of the type WP_Post and are filtered.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Ensure that any posts added/modified via one of the filters above are
+ * of the type WP_Post and are filtered.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $this->posts ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->post_count = count( $this->posts );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3553,8 +3557,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> private function set_found_posts( $q, $limits ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Bail if posts is an empty array. Continue if posts is an empty string,
- // null, or false to accommodate caching plugins that fill posts later.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Bail if posts is an empty array. Continue if posts is an empty string,
+ * null, or false to accommodate caching plugins that fill posts later.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $q['no_found_rows'] || ( is_array( $this->posts ) && ! $this->posts ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswptextdiffrenderertablephp"></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-text-diff-renderer-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-text-diff-renderer-table.php 2023-07-09 20:15:03 UTC (rev 56177)
+++ trunk/src/wp-includes/class-wp-text-diff-renderer-table.php 2023-07-09 21:23:34 UTC (rev 56178)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,8 +285,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match_all( '!(<ins>.*?</ins>|<del>.*?</del>)!', $diff, $diff_matches ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Length of all text between <ins> or <del>.
</span><span class="cx" style="display: block; padding: 0 10px"> $stripped_matches = strlen( strip_tags( implode( ' ', $diff_matches[0] ) ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Since we count length of text between <ins> or <del> (instead of picking just one),
- // we double the length of chars not in those tags.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Since we count length of text between <ins> or <del> (instead of picking just one),
+ * we double the length of chars not in those tags.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $stripped_diff = strlen( strip_tags( $diff ) ) * 2 - $stripped_matches;
</span><span class="cx" style="display: block; padding: 0 10px"> $diff_ratio = $stripped_matches / $stripped_diff;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $diff_ratio > $this->_diff_threshold ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -416,8 +418,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $orig_rows_copy = $orig_rows;
</span><span class="cx" style="display: block; padding: 0 10px"> $final_rows = array_keys( $final_matches );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Interleaves rows with blanks to keep matches aligned.
- // We may end up with some extraneous blank rows, but we'll just ignore them later.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Interleaves rows with blanks to keep matches aligned.
+ * We may end up with some extraneous blank rows, but we'll just ignore them later.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $orig_rows_copy as $orig_row ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $final_pos = array_search( $orig_matches[ $orig_row ], $final_rows, true );
</span><span class="cx" style="display: block; padding: 0 10px"> $orig_pos = (int) array_search( $orig_row, $orig_rows, true );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswptextdomainregistryphp"></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-textdomain-registry.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-textdomain-registry.php 2023-07-09 20:15:03 UTC (rev 56177)
+++ trunk/src/wp-includes/class-wp-textdomain-registry.php 2023-07-09 21:23:34 UTC (rev 56178)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,8 +201,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $found_location;
</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 no path is found for the given locale and a custom path has been set
- // using load_plugin_textdomain/load_theme_textdomain, use that one.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If no path is found for the given locale and a custom path has been set
+ * using load_plugin_textdomain/load_theme_textdomain, use that one.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'en_US' !== $locale && isset( $this->custom_paths[ $domain ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $fallback_location = rtrim( $this->custom_paths[ $domain ], '/' ) . '/';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set( $domain, $locale, $fallback_location );
</span></span></pre>
</div>
</div>
</body>
</html>