<!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>[56194] 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/56194">56194</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/56194","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-10 23:09:16 +0000 (Mon, 10 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>, <a href="https://core.trac.wordpress.org/changeset/56178">[56178]</a>, <a href="https://core.trac.wordpress.org/changeset/56179">[56179]</a>, <a href="https://core.trac.wordpress.org/changeset/56180">[56180]</a>, <a href="https://core.trac.wordpress.org/changeset/56191">[56191]</a>, <a href="https://core.trac.wordpress.org/changeset/56192">[56192]</a>, <a href="https://core.trac.wordpress.org/changeset/56193">[56193]</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="#trunksrcwpincludesrewritephp">trunk/src/wp-includes/rewrite.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
<li><a href="#trunksrcwpincludesshortcodesphp">trunk/src/wp-includes/shortcodes.php</a></li>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunksrcwpincludestemplatephp">trunk/src/wp-includes/template.php</a></li>
<li><a href="#trunksrcwpincludesthemetemplatesphp">trunk/src/wp-includes/theme-templates.php</a></li>
<li><a href="#trunksrcwpincludesthemephp">trunk/src/wp-includes/theme.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsphp">trunk/src/wp-includes/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesrewritephp"></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/rewrite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rewrite.php 2023-07-10 22:58:33 UTC (rev 56193)
+++ trunk/src/wp-includes/rewrite.php 2023-07-10 23:09:16 UTC (rev 56194)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -598,8 +598,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $request_match = $request;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $rewrite as $match => $query ) {
</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 requesting file is the anchor of the match,
- // prepend it to the path info.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If the requesting file is the anchor of the match,
+ * prepend it to the path info.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $url ) && ( $url != $request ) && str_starts_with( $match, $url ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $request_match = $url . '/' . $request;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -620,8 +622,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">- // Got a match.
- // Trim the query of everything up to the '?'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Got a match.
+ * Trim the query of everything up to the '?'.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $query = preg_replace( '!^.+\?!', '', $query );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Substitute the substring matches into the query.
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2023-07-10 22:58:33 UTC (rev 56193)
+++ trunk/src/wp-includes/script-loader.php 2023-07-10 23:09:16 UTC (rev 56194)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,8 +57,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $compressed = $compress_scripts && $concatenate_scripts && isset( $_SERVER['HTTP_ACCEPT_ENCODING'] )
</span><span class="cx" style="display: block; padding: 0 10px"> && false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip' ) && ! $force_uncompressed;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Load tinymce.js when running from /src, otherwise load wp-tinymce.js.gz (in production)
- // or tinymce.min.js (when SCRIPT_DEBUG is true).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Load tinymce.js when running from /src, otherwise load wp-tinymce.js.gz (in production)
+ * or tinymce.min.js (when SCRIPT_DEBUG is true).
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $compressed ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'wp-tinymce', includes_url( 'js/tinymce/' ) . 'wp-tinymce.js', array(), $tinymce_version );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -585,8 +587,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/class-wp-editor.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $tinymce_settings = apply_filters( 'tiny_mce_before_init', $tinymce_settings, 'classic-block' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Do "by hand" translation from PHP array to js object.
- // Prevents breakage in some custom settings.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Do "by hand" translation from PHP array to js object.
+ * Prevents breakage in some custom settings.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $init_obj = '';
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $tinymce_settings as $key => $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_bool( $value ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -825,17 +829,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Not used in core, replaced by Jcrop.js.
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'cropper', '/wp-includes/js/crop/cropper.js', array( 'scriptaculous-dragdrop' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // jQuery.
- // The unminified jquery.js and jquery-migrate.js are included to facilitate debugging.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * jQuery.
+ * The unminified jquery.js and jquery-migrate.js are included to facilitate debugging.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ), '3.7.0' );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'jquery-core', "/wp-includes/js/jquery/jquery$suffix.js", array(), '3.7.0' );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'jquery-migrate', "/wp-includes/js/jquery/jquery-migrate$suffix.js", array(), '3.4.1' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Full jQuery UI.
- // The build process in 1.12.1 has changed significantly.
- // In order to keep backwards compatibility, and to keep the optimized loading,
- // the source files were flattened and included with some modifications for AMD loading.
- // A notable change is that 'jquery-ui-core' now contains 'jquery-ui-position' and 'jquery-ui-widget'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Full jQuery UI.
+ * The build process in 1.12.1 has changed significantly.
+ * In order to keep backwards compatibility, and to keep the optimized loading,
+ * the source files were flattened and included with some modifications for AMD loading.
+ * A notable change is that 'jquery-ui-core' now contains 'jquery-ui-position' and 'jquery-ui-widget'.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'jquery-ui-core', "/wp-includes/js/jquery/ui/core$suffix.js", array( 'jquery' ), '1.13.2', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'jquery-effects-core', "/wp-includes/js/jquery/ui/effect$suffix.js", array( 'jquery' ), '1.13.2', 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -881,8 +889,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'jquery-ui-selectable', "/wp-includes/js/jquery/ui/selectable$suffix.js", array( 'jquery-ui-mouse' ), '1.13.2', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'jquery-ui-sortable', "/wp-includes/js/jquery/ui/sortable$suffix.js", array( 'jquery-ui-mouse' ), '1.13.2', 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // As of 1.12.1 `jquery-ui-position` and `jquery-ui-widget` are part of `jquery-ui-core`.
- // Listed here for back-compat.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * As of 1.12.1 `jquery-ui-position` and `jquery-ui-widget` are part of `jquery-ui-core`.
+ * Listed here for back-compat.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'jquery-ui-position', false, array( 'jquery-ui-core' ), '1.13.2', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'jquery-ui-widget', false, array( 'jquery-ui-core' ), '1.13.2', 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -915,8 +925,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Not used any more, registered for backward compatibility.
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'suggest', "/wp-includes/js/jquery/suggest$suffix.js", array( 'jquery' ), '1.1-20110113', 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Masonry v2 depended on jQuery. v3 does not. The older jquery-masonry handle is a shiv.
- // It sets jQuery as a dependency, as the theme may have been implicitly loading it this way.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Masonry v2 depended on jQuery. v3 does not. The older jquery-masonry handle is a shiv.
+ * It sets jQuery as a dependency, as the theme may have been implicitly loading it this way.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'imagesloaded', '/wp-includes/js/imagesloaded.min.js', array(), '4.1.4', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'masonry', '/wp-includes/js/masonry.min.js', array( 'imagesloaded' ), '4.2.2', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'jquery-masonry', '/wp-includes/js/jquery/jquery.masonry.min.js', array( 'jquery', 'masonry' ), '3.1.2b', 1 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1338,8 +1350,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'wp-embed', "/wp-includes/js/wp-embed$suffix.js", array(), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // To enqueue media-views or media-editor, call wp_enqueue_media().
- // Both rely on numerous settings, styles, and templates to operate correctly.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * To enqueue media-views or media-editor, call wp_enqueue_media().
+ * Both rely on numerous settings, styles, and templates to operate correctly.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'media-views', "/wp-includes/js/media-views$suffix.js", array( 'utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable', 'wp-mediaelement', 'wp-api-request', 'wp-a11y', 'clipboard' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->set_translations( 'media-views' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1635,8 +1649,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_edit_blocks_dependencies = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-components',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-editor',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // This need to be added before the block library styles,
- // The block library styles override the "reset" styles.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * This needs to be added before the block library styles,
+ * The block library styles override the "reset" styles.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wp-reset-editor-styles',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-block-library',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp-reusable-blocks',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2714,8 +2730,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $html5_script_support = ! is_admin() && ! current_theme_supports( 'html5', 'script' );
</span><span class="cx" style="display: block; padding: 0 10px"> $attributes_string = '';
</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 HTML5 script tag is supported, only the attribute name is added
- // to $attributes_string for entries with a boolean value, and that are true.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If HTML5 script tag is supported, only the attribute name is added
+ * to $attributes_string for entries with a boolean value, and that are true.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $attributes as $attribute_name => $attribute_value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_bool( $attribute_value ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $attribute_value ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2896,8 +2914,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Get the styles if we don't already have them.
</span><span class="cx" style="display: block; padding: 0 10px"> $style['css'] = file_get_contents( $style['path'] );
</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 the style contains relative URLs that need to be modified.
- // URLs relative to the stylesheet's path should be converted to relative to the site's root.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Check if the style contains relative URLs that need to be modified.
+ * URLs relative to the stylesheet's path should be converted to relative to the site's root.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $style['css'] = _wp_normalize_relative_css_links( $style['css'], $style['src'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set `src` to `false` and add styles inline.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3710,9 +3730,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $suffix = wp_scripts_get_suffix();
</span><span class="cx" style="display: block; padding: 0 10px"> $classic_theme_styles = ABSPATH . WPINC . "/css/classic-themes$suffix.css";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // This follows the pattern of get_block_editor_theme_styles,
- // but we can't use get_block_editor_theme_styles directly as it
- // only handles external files or theme files.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * This follows the pattern of get_block_editor_theme_styles,
+ * but we can't use get_block_editor_theme_styles directly as it
+ * only handles external files or theme files.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $classic_theme_styles_settings = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'css' => file_get_contents( $classic_theme_styles ),
</span><span class="cx" style="display: block; padding: 0 10px"> '__unstableType' => 'core',
</span></span></pre></div>
<a id="trunksrcwpincludesshortcodesphp"></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/shortcodes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/shortcodes.php 2023-07-10 22:58:33 UTC (rev 56193)
+++ trunk/src/wp-includes/shortcodes.php 2023-07-10 23:09:16 UTC (rev 56194)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,8 +263,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $tagregexp = implode( '|', array_map( 'preg_quote', $tagnames ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // WARNING! Do not change this regex without changing do_shortcode_tag() and strip_shortcode_tag().
- // Also, see shortcode_unautop() and shortcode.js.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * WARNING! Do not change this regex without changing do_shortcode_tag() and strip_shortcode_tag().
+ * Also, see shortcode_unautop() and shortcode.js.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // phpcs:disable Squiz.Strings.ConcatenationSpacing.PaddingFound -- don't remove regex indentation
</span><span class="cx" style="display: block; padding: 0 10px"> return '\\[' // Opening bracket.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -466,8 +468,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $attr = preg_replace_callback( "/$pattern/", 'do_shortcode_tag', $attr );
</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">- // $attr like 'name = "[shortcode]"' or "name = '[shortcode]'".
- // We do not know if $content was unfiltered. Assume KSES ran before shortcodes.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * $attr like 'name = "[shortcode]"' or "name = '[shortcode]'".
+ * We do not know if $content was unfiltered. Assume KSES ran before shortcodes.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $count = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $new_attr = preg_replace_callback( "/$pattern/", 'do_shortcode_tag', $attr, -1, $count );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $count > 0 ) {
</span></span></pre></div>
<a id="trunksrcwpincludestaxonomyphp"></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/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy.php 2023-07-10 22:58:33 UTC (rev 56193)
+++ trunk/src/wp-includes/taxonomy.php 2023-07-10 23:09:16 UTC (rev 56194)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3250,8 +3250,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Check for duplicate slug.
</span><span class="cx" style="display: block; padding: 0 10px"> $duplicate = get_term_by( 'slug', $slug, $taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $duplicate && $duplicate->term_id !== $term_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If an empty slug was passed or the parent changed, reset the slug to something unique.
- // Otherwise, bail.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If an empty slug was passed or the parent changed, reset the slug to something unique.
+ * Otherwise, bail.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $empty_slug || ( $parent !== (int) $term['parent'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $slug = wp_unique_term_slug( $slug, (object) $args );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpincludestemplatephp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/template.php 2023-07-10 22:58:33 UTC (rev 56193)
+++ trunk/src/wp-includes/template.php 2023-07-10 23:09:16 UTC (rev 56194)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -470,8 +470,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $pagename = get_query_var( 'pagename' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $pagename && $id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If a static page is set as the front page, $pagename will not be set.
- // Retrieve it from the queried object.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If a static page is set as the front page, $pagename will not be set.
+ * Retrieve it from the queried object.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_queried_object();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $pagename = $post->post_name;
</span></span></pre></div>
<a id="trunksrcwpincludesthemetemplatesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/theme-templates.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme-templates.php 2023-07-10 22:58:33 UTC (rev 56193)
+++ trunk/src/wp-includes/theme-templates.php 2023-07-10 23:09:16 UTC (rev 56194)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,8 +173,10 @@
</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">- // Get the site wrapper.
- // The skip-link will be injected in the beginning of it.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Get the site wrapper.
+ * The skip-link will be injected in the beginning of it.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> sibling = document.querySelector( '.wp-site-blocks' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Early exit if the root element was not found.
</span></span></pre></div>
<a id="trunksrcwpincludesthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme.php 2023-07-10 22:58:33 UTC (rev 56193)
+++ trunk/src/wp-includes/theme.php 2023-07-10 23:09:16 UTC (rev 56194)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,8 +45,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_directories = search_theme_directories();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $wp_theme_directories ) && count( $wp_theme_directories ) > 1 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Make sure the active theme wins out, in case search_theme_directories() picks the wrong
- // one in the case of a conflict. (Normally, last registered theme root wins.)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Make sure the active theme wins out, in case search_theme_directories() picks the wrong
+ * one in the case of a conflict. (Normally, last registered theme root wins.)
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $current_theme = get_stylesheet();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $theme_directories[ $current_theme ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $root_of_current_theme = get_raw_theme_root( $current_theme );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -510,8 +512,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"> if ( file_exists( $theme_root . '/' . $dir . '/style.css' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // wp-content/themes/a-single-theme
- // wp-content/themes is $theme_root, a-single-theme is $dir.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * wp-content/themes/a-single-theme
+ * wp-content/themes is $theme_root, a-single-theme is $dir.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $found_themes[ $dir ] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_file' => $dir . '/style.css',
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_root' => $theme_root,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -518,8 +522,10 @@
</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"> $found_theme = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // wp-content/themes/a-folder-of-themes/*
- // wp-content/themes is $theme_root, a-folder-of-themes is $dir, then themes are $sub_dirs.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * wp-content/themes/a-folder-of-themes/*
+ * wp-content/themes is $theme_root, a-folder-of-themes is $dir, then themes are $sub_dirs.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $sub_dirs = @ scandir( $theme_root . '/' . $dir );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $sub_dirs ) {
</span><span class="cx" style="display: block; padding: 0 10px"> trigger_error( "$theme_root/$dir is not readable", E_USER_NOTICE );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -538,8 +544,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $found_theme = 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">- // Never mind the above, it's just a theme missing a style.css.
- // Return it; WP_Theme will catch the error.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Never mind the above, it's just a theme missing a style.css.
+ * Return it; WP_Theme will catch the error.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $found_theme ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $found_themes[ $dir ] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_file' => $dir . '/style.css',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -587,8 +595,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $stylesheet_or_template ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_root = get_raw_theme_root( $stylesheet_or_template );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $theme_root ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Always prepend WP_CONTENT_DIR unless the root currently registered as a theme directory.
- // This gives relative theme roots the benefit of the doubt when things go haywire.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Always prepend WP_CONTENT_DIR unless the root currently registered as a theme directory.
+ * This gives relative theme roots the benefit of the doubt when things go haywire.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $theme_root, (array) $wp_theme_directories, true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_root = WP_CONTENT_DIR . $theme_root;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1832,8 +1842,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // $background is the saved custom image, or the default image.
</span><span class="cx" style="display: block; padding: 0 10px"> $background = set_url_scheme( get_background_image() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // $color is the saved custom color.
- // A default has to be specified in style.css. It will not be printed here.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * $color is the saved custom color.
+ * A default has to be specified in style.css. It will not be printed here.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $color = get_background_color();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_theme_support( 'custom-background', 'default-color' ) === $color ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2507,8 +2519,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // All that's left now are posts (besides attachments).
- // Not a default case for the sake of clarity and future work.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * All that's left now are posts (besides attachments).
+ * Not a default case for the sake of clarity and future work.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'posts':
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $config[ $type ] as $id => $item ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $item ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2735,14 +2749,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $jit = isset( $args[0]['__jit'] );
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $args[0]['__jit'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Merge in data from previous add_theme_support() calls.
- // The first value registered wins. (A child theme is set up first.)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Merge in data from previous add_theme_support() calls.
+ * The first value registered wins. (A child theme is set up first.)
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_wp_theme_features['custom-header'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args[0] = wp_parse_args( $_wp_theme_features['custom-header'][0], $args[0] );
</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">- // Load in the defaults at the end, as we need to insure first one wins.
- // This will cause all constants to be defined, as each arg will then be set to the default.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Load in the defaults at the end, as we need to insure first one wins.
+ * This will cause all constants to be defined, as each arg will then be set to the default.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $jit ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args[0] = wp_parse_args( $args[0], $defaults );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2789,8 +2807,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args[0]['random-default'] = 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">- // If headers are supported, and we still don't have a defined width or height,
- // we have implicit flex sizes.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If headers are supported, and we still don't have a defined width or height,
+ * we have implicit flex sizes.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $jit ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $args[0]['width'] ) && empty( $args[0]['flex-width'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args[0]['flex-width'] = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3487,12 +3507,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $autosaved = null;
</span><span class="cx" style="display: block; padding: 0 10px"> $messenger_channel = null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Value false indicates UUID should be determined after_setup_theme
- // to either re-use existing saved changeset or else generate a new UUID if none exists.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Value false indicates UUID should be determined after_setup_theme
+ * to either re-use existing saved changeset or else generate a new UUID if none exists.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $changeset_uuid = false;
</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 initially fo false since defaults to true for back-compat;
- // can be overridden via the customize_changeset_branching filter.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Set initially fo false since defaults to true for back-compat;
+ * can be overridden via the customize_changeset_branching filter.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $branching = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $is_customize_admin_page && isset( $input_vars['changeset_uuid'] ) ) {
</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 2023-07-10 22:58:33 UTC (rev 56193)
+++ trunk/src/wp-includes/user.php 2023-07-10 23:09:16 UTC (rev 56194)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1065,8 +1065,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = get_current_user_id();
</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">- // Technically not needed, but does save calls to get_site() and get_user_meta()
- // in the event that the function is called when a user isn't logged in.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Technically not needed, but does save calls to get_site() and get_user_meta()
+ * in the event that the function is called when a user isn't logged in.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $user_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2723,8 +2725,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $plaintext_pass ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_clear_auth_cookie();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Here we calculate the expiration length of the current auth cookie and compare it to the default expiration.
- // If it's greater than this, then we know the user checked 'Remember Me' when they logged in.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Here we calculate the expiration length of the current auth cookie and compare it to the default expiration.
+ * If it's greater than this, then we know the user checked 'Remember Me' when they logged in.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $logged_in_cookie = wp_parse_auth_cookie( '', 'logged_in' );
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/pluggable.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $default_cookie_life = apply_filters( 'auth_cookie_expiration', ( 2 * DAY_IN_SECONDS ), $user_id, false );
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets.php 2023-07-10 22:58:33 UTC (rev 56193)
+++ trunk/src/wp-includes/widgets.php 2023-07-10 23:09:16 UTC (rev 56194)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,8 +185,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_args['name'] = isset( $args['name'] ) ? $args['name'] : __( 'Sidebar' );
</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">- // Custom specified ID's are suffixed if they exist already.
- // Automatically generated sidebar names need to be suffixed regardless starting at -0.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Custom specified ID's are suffixed if they exist already.
+ * Automatically generated sidebar names need to be suffixed regardless starting at -0.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $args['id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_args['id'] = $args['id'];
</span><span class="cx" style="display: block; padding: 0 10px"> $n = 2; // Start at -2 for conflicting custom IDs.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1013,8 +1015,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> global $_wp_sidebars_widgets, $sidebars_widgets;
</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 loading from front page, consult $_wp_sidebars_widgets rather than options
- // to see if wp_convert_widget_settings() has made manipulations in memory.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If loading from front page, consult $_wp_sidebars_widgets rather than options
+ * to see if wp_convert_widget_settings() has made manipulations in memory.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $_wp_sidebars_widgets ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_wp_sidebars_widgets = get_option( 'sidebars_widgets', array() );
</span></span></pre>
</div>
</div>
</body>
</html>