<!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>[52352] trunk: Docs: Correct the format of some comments per the documentation standards.</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/52352">52352</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/52352","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-12-10 20:28:27 +0000 (Fri, 10 Dec 2021)</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: Correct the format of some comments per the documentation standards.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/10357">[10357]</a>, <a href="https://core.trac.wordpress.org/changeset/10939">[10939]</a>, <a href="https://core.trac.wordpress.org/changeset/43309">[43309]</a>, <a href="https://core.trac.wordpress.org/changeset/51003">[51003]</a>, <a href="https://core.trac.wordpress.org/changeset/51266">[51266]</a>, <a href="https://core.trac.wordpress.org/changeset/51653">[51653]</a>, <a href="https://core.trac.wordpress.org/changeset/51738">[51738]</a>, <a href="https://core.trac.wordpress.org/changeset/52110">[52110]</a>.
See <a href="https://core.trac.wordpress.org/ticket/53399">#53399</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludespluginphp">trunk/src/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunksrcwpadminindexphp">trunk/src/wp-admin/index.php</a></li>
<li><a href="#trunksrcwpadminloadscriptsphp">trunk/src/wp-admin/load-scripts.php</a></li>
<li><a href="#trunksrcwpadminloadstylesphp">trunk/src/wp-admin/load-styles.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizewidgetsphp">trunk/src/wp-includes/class-wp-customize-widgets.php</a></li>
<li><a href="#trunksrcwpincludesdefaultfiltersphp">trunk/src/wp-includes/default-filters.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesloadphp">trunk/src/wp-includes/load.php</a></li>
<li><a href="#trunksrcwpincludestemplatecanvasphp">trunk/src/wp-includes/template-canvas.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
<li><a href="#trunktestsphpunitdatawidgetscustomwidgetclassesphp">trunk/tests/phpunit/data/widgets/custom-widget-classes.php</a></li>
<li><a href="#trunktestsphpunittestsoptionsanitizeoptionphp">trunk/tests/phpunit/tests/option/sanitize-option.php</a></li>
<li><a href="#trunktestsphpunittestsuserphp">trunk/tests/phpunit/tests/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludespluginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin.php 2021-12-10 00:04:03 UTC (rev 52351)
+++ trunk/src/wp-admin/includes/plugin.php 2021-12-10 20:28:27 UTC (rev 52352)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2523,7 +2523,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $deactivated_plugins as $plugin ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $plugin['version_compatible'] ) && ! empty( $plugin['version_deactivated'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $explanation = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Name of deactivated plugin, 2: Plugin version deactivated, 3: Current WP version, 4: Compatible plugin version */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Name of deactivated plugin, 2: Plugin version deactivated, 3: Current WP version, 4: Compatible plugin version. */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '%1$s %2$s was deactivated due to incompatibility with WordPress %3$s, please upgrade to %1$s %4$s or later.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin['plugin_name'],
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin['version_deactivated'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2532,7 +2532,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"> $explanation = sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Name of deactivated plugin, 2: Plugin version deactivated, 3: Current WP version */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Name of deactivated plugin, 2: Plugin version deactivated, 3: Current WP version. */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '%1$s %2$s was deactivated due to incompatibility with WordPress %3$s.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin['plugin_name'],
</span><span class="cx" style="display: block; padding: 0 10px"> ! empty( $plugin['version_deactivated'] ) ? $plugin['version_deactivated'] : '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2544,7 +2544,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<div class="notice notice-warning"><p><strong>%s</strong><br>%s</p><p><a href="%s">%s</a></p></div>',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: Name of deactivated plugin */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Name of deactivated plugin. */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '%s plugin deactivated during WordPress upgrade.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin['plugin_name']
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span></span></pre></div>
<a id="trunksrcwpadminindexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/index.php 2021-12-10 00:04:03 UTC (rev 52351)
+++ trunk/src/wp-admin/index.php 2021-12-10 20:28:27 UTC (rev 52352)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*
</ins><span class="cx" style="display: block; padding: 0 10px"> * Note: this file exists only to remind developers to build the assets.
</span><span class="cx" style="display: block; padding: 0 10px"> * For the real wp-admin/index.php that gets built and boots WordPress,
</span><span class="cx" style="display: block; padding: 0 10px"> * please refer to wp-admin/_index.php.
</span></span></pre></div>
<a id="trunksrcwpadminloadscriptsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/load-scripts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/load-scripts.php 2021-12-10 00:04:03 UTC (rev 52351)
+++ trunk/src/wp-admin/load-scripts.php 2021-12-10 20:28:27 UTC (rev 52352)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*
</ins><span class="cx" style="display: block; padding: 0 10px"> * Disable error reporting
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Set this to error_reporting( -1 ) for debugging.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,7 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> error_reporting( 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/** Set ABSPATH for execution */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Set ABSPATH for execution.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'ABSPATH' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'ABSPATH', dirname( __DIR__ ) . '/' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminloadstylesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/load-styles.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/load-styles.php 2021-12-10 00:04:03 UTC (rev 52351)
+++ trunk/src/wp-admin/load-styles.php 2021-12-10 20:28:27 UTC (rev 52352)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*
</ins><span class="cx" style="display: block; padding: 0 10px"> * Disable error reporting
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Set this to error_reporting( -1 ) for debugging
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,7 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> error_reporting( 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/** Set ABSPATH for execution */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Set ABSPATH for execution.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'ABSPATH' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'ABSPATH', dirname( __DIR__ ) . '/' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizemanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-manager.php 2021-12-10 00:04:03 UTC (rev 52351)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2021-12-10 20:28:27 UTC (rev 52352)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -346,7 +346,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Customize_Manager::__construct()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string[] $components Array of core components to load.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param WP_Customize_Manager $manager WP_Customize_Manager instance.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param WP_Customize_Manager $manager WP_Customize_Manager instance.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $components = apply_filters( 'customize_loaded_components', $this->components, $this );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizewidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-widgets.php 2021-12-10 00:04:03 UTC (rev 52351)
+++ trunk/src/wp-includes/class-wp-customize-widgets.php 2021-12-10 20:28:27 UTC (rev 52352)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1421,9 +1421,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $widget_object->widget_options['show_instance_in_rest'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'block' === $id_base && ! current_user_can( 'unfiltered_html' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The content of the 'block' widget is not filtered on the
- * fly while editing. Filter the content here to prevent
- * vulnerabilities.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The content of the 'block' widget is not filtered on the fly while editing.
+ * Filter the content here to prevent vulnerabilities.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $value['raw_instance']['content'] = wp_kses_post( $value['raw_instance']['content'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/default-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-filters.php 2021-12-10 00:04:03 UTC (rev 52351)
+++ trunk/src/wp-includes/default-filters.php 2021-12-10 20:28:27 UTC (rev 52352)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -674,7 +674,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'user_has_cap', 'wp_maybe_grant_resume_extensions_caps', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'user_has_cap', 'wp_maybe_grant_site_health_caps', 1, 4 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Block Templates post type and Rendering
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Block templates post type and rendering.
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'render_block_context', '_block_template_render_without_post_block_context' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_wp_unique_post_slug', 'wp_filter_wp_template_unique_post_slug', 10, 5 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'save_post_wp_template_part', 'wp_set_unique_slug_on_create_template_part' );
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2021-12-10 00:04:03 UTC (rev 52351)
+++ trunk/src/wp-includes/functions.php 2021-12-10 20:28:27 UTC (rev 52352)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2538,8 +2538,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = str_replace( "{$fname}{$ext}", "{$fname}-{$number}{$ext}", $filename );
</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">- // Get the mime type. Uploaded files were already checked with wp_check_filetype_and_ext()
- // in _wp_handle_upload(). Using wp_check_filetype() would be sufficient here.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Get the mime type. Uploaded files were already checked with wp_check_filetype_and_ext()
+ * in _wp_handle_upload(). Using wp_check_filetype() would be sufficient here.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $file_type = wp_check_filetype( $filename );
</span><span class="cx" style="display: block; padding: 0 10px"> $mime_type = $file_type['type'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2550,27 +2552,40 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $lc_ext = strtolower( $ext );
</span><span class="cx" style="display: block; padding: 0 10px"> $_dir = trailingslashit( $dir );
</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 the extension is uppercase add an alternate file name with lowercase extension. Both need to be tested
- // for uniqueness as the extension will be changed to lowercase for better compatibility with different filesystems.
- // Fixes an inconsistency in WP < 2.9 where uppercase extensions were allowed but image sub-sizes were created with
- // lowercase extensions.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If the extension is uppercase add an alternate file name with lowercase extension.
+ * Both need to be tested for uniqueness as the extension will be changed to lowercase
+ * for better compatibility with different filesystems. Fixes an inconsistency in WP < 2.9
+ * where uppercase extensions were allowed but image sub-sizes were created with
+ * lowercase extensions.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $ext && $lc_ext !== $ext ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $lc_filename = preg_replace( '|' . preg_quote( $ext ) . '$|', $lc_ext, $filename );
</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">- // Increment the number added to the file name if there are any files in $dir whose names match one of the
- // possible name variations.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Increment the number added to the file name if there are any files in $dir
+ * whose names match one of the possible name variations.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> while ( file_exists( $_dir . $filename ) || ( $lc_filename && file_exists( $_dir . $lc_filename ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $new_number = (int) $number + 1;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $lc_filename ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $lc_filename = str_replace( array( "-{$number}{$lc_ext}", "{$number}{$lc_ext}" ), "-{$new_number}{$lc_ext}", $lc_filename );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $lc_filename = str_replace(
+ array( "-{$number}{$lc_ext}", "{$number}{$lc_ext}" ),
+ "-{$new_number}{$lc_ext}",
+ $lc_filename
+ );
</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"> if ( '' === "{$number}{$ext}" ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = "{$filename}-{$new_number}";
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $filename = str_replace( array( "-{$number}{$ext}", "{$number}{$ext}" ), "-{$new_number}{$ext}", $filename );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $filename = str_replace(
+ array( "-{$number}{$ext}", "{$number}{$ext}" ),
+ "-{$new_number}{$ext}",
+ $filename
+ );
</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"> $number = $new_number;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2581,8 +2596,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = $lc_filename;
</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">- // Prevent collisions with existing file names that contain dimension-like strings
- // (whether they are subsizes or originals uploaded prior to #42437).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Prevent collisions with existing file names that contain dimension-like strings
+ * (whether they are subsizes or originals uploaded prior to #42437).
+ */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $files = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $count = 10000;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2617,8 +2634,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $files ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $count = count( $files );
</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 this never goes into infinite loop
- // as it uses pathinfo() and regex in the check, but string replacement for the changes.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Ensure this never goes into infinite loop as it uses pathinfo() and regex in the check,
+ * but string replacement for the changes.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $i = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> while ( $i <= $count && _wp_check_existing_file_names( $filename, $files ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2625,7 +2644,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $new_number = (int) $number + 1;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If $ext is uppercase it was replaced with the lowercase version after the previous loop.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $filename = str_replace( array( "-{$number}{$lc_ext}", "{$number}{$lc_ext}" ), "-{$new_number}{$lc_ext}", $filename );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $filename = str_replace(
+ array( "-{$number}{$lc_ext}", "{$number}{$lc_ext}" ),
+ "-{$new_number}{$lc_ext}",
+ $filename
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $number = $new_number;
</span><span class="cx" style="display: block; padding: 0 10px"> $i++;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2633,8 +2656,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Check if an image will be converted after uploading or some existing images sub-sizes file names may conflict
- // when regenerated. If yes, ensure the new file name will be unique and will produce unique sub-sizes.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Check if an image will be converted after uploading or some existing image sub-size file names may conflict
+ * when regenerated. If yes, ensure the new file name will be unique and will produce unique sub-sizes.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $is_image ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/class-wp-image-editor.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $output_formats = apply_filters( 'image_editor_output_format', array(), $_dir . $filename, $mime_type );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2668,8 +2693,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 ( ! empty( $alt_filenames ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Add the original filename. It needs to be checked again together with the alternate filenames
- // when $number is incremented.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Add the original filename. It needs to be checked again
+ * together with the alternate filenames when $number is incremented.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $alt_filenames[ $lc_ext ] = $filename;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Ensure no infinite loop.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2679,12 +2706,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $new_number = (int) $number + 1;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $alt_filenames as $alt_ext => $alt_filename ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $alt_filenames[ $alt_ext ] = str_replace( array( "-{$number}{$alt_ext}", "{$number}{$alt_ext}" ), "-{$new_number}{$alt_ext}", $alt_filename );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $alt_filenames[ $alt_ext ] = str_replace(
+ array( "-{$number}{$alt_ext}", "{$number}{$alt_ext}" ),
+ "-{$new_number}{$alt_ext}",
+ $alt_filename
+ );
</ins><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">- // Also update the $number in (the output) $filename.
- // If the extension was uppercase it was already replaced with the lowercase version.
- $filename = str_replace( array( "-{$number}{$lc_ext}", "{$number}{$lc_ext}" ), "-{$new_number}{$lc_ext}", $filename );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Also update the $number in (the output) $filename.
+ * If the extension was uppercase it was already replaced with the lowercase version.
+ */
+ $filename = str_replace(
+ array( "-{$number}{$lc_ext}", "{$number}{$lc_ext}" ),
+ "-{$new_number}{$lc_ext}",
+ $filename
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $number = $new_number;
</span><span class="cx" style="display: block; padding: 0 10px"> $i++;
</span></span></pre></div>
<a id="trunksrcwpincludesloadphp"></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/load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/load.php 2021-12-10 00:04:03 UTC (rev 52351)
+++ trunk/src/wp-includes/load.php 2021-12-10 20:28:27 UTC (rev 52352)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -426,7 +426,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether to allow the debug mode check to occur.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * This filter runs before it can be used by plugins. It is designed for
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * non-web run-times. Returning false causes the `WP_DEBUG` and related
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * non-web runtimes. Returning false causes the `WP_DEBUG` and related
</ins><span class="cx" style="display: block; padding: 0 10px"> * constants to not be checked and the default PHP values for errors
</span><span class="cx" style="display: block; padding: 0 10px"> * will be used unless you take care to update them yourself.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -673,7 +673,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether to enable loading of the object-cache.php drop-in.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * This filter runs before it can be used by plugins. It is designed for non-web
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * run-times. If false is returned, object-cache.php will never be loaded.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * runtimes. If false is returned, object-cache.php will never be loaded.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.8.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludestemplatecanvasphp"></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/template-canvas.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/template-canvas.php 2021-12-10 00:04:03 UTC (rev 52351)
+++ trunk/src/wp-includes/template-canvas.php 2021-12-10 20:28:27 UTC (rev 52352)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @package WordPress
</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">-/**
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*
</ins><span class="cx" style="display: block; padding: 0 10px"> * Get the template HTML.
</span><span class="cx" style="display: block; padding: 0 10px"> * This needs to run before <head> so that blocks can add scripts and styles in wp_head().
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwpincludesuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user.php 2021-12-10 00:04:03 UTC (rev 52351)
+++ trunk/src/wp-includes/user.php 2021-12-10 20:28:27 UTC (rev 52352)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2158,7 +2158,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * It only includes data in the users table, not any user metadata.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.9.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 5.8.0 The $userdata parameter was added.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.8.0 The `$userdata` parameter was added.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $data {
</span><span class="cx" style="display: block; padding: 0 10px"> * Values and keys for the user.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2203,7 +2203,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * For custom meta fields, see the {@see 'insert_custom_user_meta'} filter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 5.8.0 The $userdata parameter was added.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.8.0 The `$userdata` parameter was added.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $meta {
</span><span class="cx" style="display: block; padding: 0 10px"> * Default meta values and keys for the user.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2274,7 +2274,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires immediately after an existing user is updated.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 5.8.0 The $userdata parameter was added.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.8.0 The `$userdata` parameter was added.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $user_id User ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_User $old_user_data Object containing user's data prior to update.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2308,7 +2308,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires immediately after a new user is registered.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 5.8.0 The $userdata parameter was added.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.8.0 The `$userdata` parameter was added.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $user_id User ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $userdata The raw array of data passed to wp_insert_user().
</span></span></pre></div>
<a id="trunktestsphpunitdatawidgetscustomwidgetclassesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/widgets/custom-widget-classes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/widgets/custom-widget-classes.php 2021-12-10 00:04:03 UTC (rev 52351)
+++ trunk/tests/phpunit/data/widgets/custom-widget-classes.php 2021-12-10 20:28:27 UTC (rev 52352)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,14 +1,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> namespace Test\Sub\Sub {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- class Namespaced_Widget extends \WP_Widget {
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ class Namespaced_Widget extends \WP_Widget {}
</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="cx" style="display: block; padding: 0 10px"> namespace {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- class Non_Namespaced_Widget extends \WP_Widget {
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ class Non_Namespaced_Widget extends \WP_Widget {}
</ins><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="trunktestsphpunittestsoptionsanitizeoptionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/option/sanitize-option.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/sanitize-option.php 2021-12-10 00:04:03 UTC (rev 52351)
+++ trunk/tests/phpunit/tests/option/sanitize-option.php 2021-12-10 20:28:27 UTC (rev 52352)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,7 +155,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/%postname%/', '/%postname%/', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/%year%/%monthnum%/%day%/%postname%/', '/%year%/%monthnum%/%day%/%postname%/', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/%year/%postname%/', '/%year/%postname%/', true ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( new WP_Error( 'wpdb_get_table_charset_failure' ), false, false ), // ticket 53986
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( new WP_Error( 'wpdb_get_table_charset_failure' ), false, false ), // @ticket 53986
</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="trunktestsphpunittestsuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user.php 2021-12-10 00:04:03 UTC (rev 52351)
+++ trunk/tests/phpunit/tests/user.php 2021-12-10 20:28:27 UTC (rev 52352)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1909,9 +1909,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * This hook is used in `test_wp_insert_user_with_meta()`.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function filter_custom_meta( $meta_input ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Update some meta inputs
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Update some meta inputs.
</ins><span class="cx" style="display: block; padding: 0 10px"> $meta_input['test_meta_key'] = 'update_from_filter';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Add a new meta
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add a new meta.
</ins><span class="cx" style="display: block; padding: 0 10px"> $meta_input['new_meta_from_filter'] = 'new_from_filter';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $meta_input;
</span></span></pre>
</div>
</div>
</body>
</html>