<!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>[56177] 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/56177">56177</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/56177","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>audrasjb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-07-09 20:15:03 +0000 (Sun, 09 Jul 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Docs: Replace multiple single line comments with multi-line comments.
This changeset updates various comments as per WordPress PHP Inline Documentation Standards.
See https://developer.wordpress.org/coding-standards/inline-documentation-standards/php/<a href="https://core.trac.wordpress.org/ticket/5">#5</a>-inline-comments.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/56174">[56174]</a>, <a href="https://core.trac.wordpress.org/changeset/56175">[56175]</a>, <a href="https://core.trac.wordpress.org/changeset/56176">[56176]</a>.
Props costdev, audrasjb.
See <a href="https://core.trac.wordpress.org/ticket/58459">#58459</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesbookmarkphp">trunk/src/wp-includes/bookmark.php</a></li>
<li><a href="#trunksrcwpincludescanonicalphp">trunk/src/wp-includes/canonical.php</a></li>
<li><a href="#trunksrcwpincludescapabilitiesphp">trunk/src/wp-includes/capabilities.php</a></li>
<li><a href="#trunksrcwpincludesclasswpadminbarphp">trunk/src/wp-includes/class-wp-admin-bar.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizecontrolphp">trunk/src/wp-includes/class-wp-customize-control.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunksrcwpincludesclasswpeditorphp">trunk/src/wp-includes/class-wp-editor.php</a></li>
<li><a href="#trunksrcwpincludesclasswpembedphp">trunk/src/wp-includes/class-wp-embed.php</a></li>
<li><a href="#trunksrcwpincludesclasswpimageeditorgdphp">trunk/src/wp-includes/class-wp-image-editor-gd.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesbookmarkphp"></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/bookmark.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/bookmark.php 2023-07-09 20:05:43 UTC (rev 56176)
+++ trunk/src/wp-includes/bookmark.php 2023-07-09 20:15:03 UTC (rev 56177)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -404,8 +404,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $field ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'link_category': // array( ints )
</span><span class="cx" style="display: block; padding: 0 10px"> $value = array_map( 'absint', (array) $value );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // We return here so that the categories aren't filtered.
- // The 'link_category' filter is for the name of a link category, not an array of a link's link categories.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * We return here so that the categories aren't filtered.
+ * The 'link_category' filter is for the name of a link category, not an array of a link's link categories.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> return $value;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'link_visible': // bool stored as Y|N
</span></span></pre></div>
<a id="trunksrcwpincludescanonicalphp"></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/canonical.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/canonical.php 2023-07-09 20:05:43 UTC (rev 56176)
+++ trunk/src/wp-includes/canonical.php 2023-07-09 20:15:03 UTC (rev 56177)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,8 +46,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">- // If we're not in wp-admin and the post has been published and preview nonce
- // is non-existent or invalid then no need for preview in query.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If we're not in wp-admin and the post has been published and preview nonce
+ * is non-existent or invalid then no need for preview in query.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_preview() && get_query_var( 'p' ) && 'publish' === get_post_status( get_query_var( 'p' ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $_GET['preview_id'] )
</span><span class="cx" style="display: block; padding: 0 10px"> || ! isset( $_GET['preview_nonce'] )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -689,8 +691,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $original_host_low = strtolower( $original['host'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_host_low = strtolower( $redirect['host'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Ignore differences in host capitalization, as this can lead to infinite redirects.
- // Only redirect no-www <=> yes-www.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Ignore differences in host capitalization, as this can lead to infinite redirects.
+ * Only redirect no-www <=> yes-www.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $original_host_low === $redirect_host_low
</span><span class="cx" style="display: block; padding: 0 10px"> || ( 'www.' . $original_host_low !== $redirect_host_low
</span><span class="cx" style="display: block; padding: 0 10px"> && 'www.' . $redirect_host_low !== $original_host_low )
</span></span></pre></div>
<a id="trunksrcwpincludescapabilitiesphp"></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/capabilities.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/capabilities.php 2023-07-09 20:05:43 UTC (rev 56176)
+++ trunk/src/wp-includes/capabilities.php 2023-07-09 20:15:03 UTC (rev 56177)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,8 +172,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"> break;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // edit_post breaks down to edit_posts, edit_published_posts, or
- // edit_others_posts.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * edit_post breaks down to edit_posts, edit_published_posts, or
+ * edit_others_posts.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'edit_post':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'edit_page':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $args[0] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -617,8 +619,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'install_themes':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'upload_themes':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'update_core':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Disallow anything that creates, deletes, or updates core, plugin, or theme files.
- // Files in uploads are excepted.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Disallow anything that creates, deletes, or updates core, plugin, or theme files.
+ * Files in uploads are excepted.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp_is_file_mod_allowed( 'capability_update_core' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $caps[] = 'do_not_allow';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpadminbarphp"></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-admin-bar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-admin-bar.php 2023-07-09 20:05:43 UTC (rev 56176)
+++ trunk/src/wp-includes/class-wp-admin-bar.php 2023-07-09 20:15:03 UTC (rev 56177)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -313,8 +313,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">- // Add the root node.
- // Clear it first, just in case. Don't mess with The Root.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Add the root node.
+ * Clear it first, just in case. Don't mess with The Root.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->remove_node( 'root' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_node(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -362,11 +364,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $default_id = $parent->id . '-default';
</span><span class="cx" style="display: block; padding: 0 10px"> $default = $this->_get_node( $default_id );
</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 default group is added here to allow groups that are
- // added before standard menu items to render first.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * The default group is added here to allow groups that are
+ * added before standard menu items to render first.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $default ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Use _set_node because add_node can be overloaded.
- // Make sure to specify default settings for all properties.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Use _set_node because add_node can be overloaded.
+ * Make sure to specify default settings for all properties.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->_set_node(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $default_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -385,8 +391,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $parent = $default;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Groups in groups aren't allowed. Add a special 'container' node.
- // The container will invisibly wrap both groups.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Groups in groups aren't allowed. Add a special 'container' node.
+ * The container will invisibly wrap both groups.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'group' === $parent->type && 'group' === $node->type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $container_id = $parent->id . '-container';
</span><span class="cx" style="display: block; padding: 0 10px"> $container = $this->_get_node( $container_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -393,8 +401,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We need to create a container for this group, life is sad.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $container ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Use _set_node because add_node can be overloaded.
- // Make sure to specify default settings for all properties.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Use _set_node because add_node can be overloaded.
+ * Make sure to specify default settings for all properties.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->_set_node(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $container_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -447,8 +457,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $root
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> final protected function _render( $root ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Add browser classes.
- // We have to do this here since admin bar shows on the front end.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Add browser classes.
+ * We have to do this here since admin bar shows on the front end.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $class = 'nojq nojs';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( wp_is_mobile() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $class .= ' mobile';
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizecontrolphp"></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-control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-control.php 2023-07-09 20:05:43 UTC (rev 56176)
+++ trunk/src/wp-includes/class-wp-customize-control.php 2023-07-09 20:15:03 UTC (rev 56177)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -607,8 +607,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Hackily add in the data link parameter.
</span><span class="cx" style="display: block; padding: 0 10px"> $dropdown = str_replace( '<select', '<select ' . $this->get_link() . ' id="' . esc_attr( $input_id ) . '" ' . $describedby_attr, $dropdown );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Even more hacikly add auto-draft page stubs.
- // @todo Eventually this should be removed in favor of the pages being injected into the underlying get_pages() call. See <https://github.com/xwp/wp-customize-posts/pull/250>.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Even more hacikly add auto-draft page stubs.
+ * @todo Eventually this should be removed in favor of the pages being injected into the underlying get_pages() call.
+ * See <https://github.com/xwp/wp-customize-posts/pull/250>.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $nav_menus_created_posts_setting = $this->manager->get_setting( 'nav_menus_created_posts' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $nav_menus_created_posts_setting && current_user_can( 'publish_pages' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $auto_draft_page_options = '';
</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 2023-07-09 20:05:43 UTC (rev 56176)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2023-07-09 20:15:03 UTC (rev 56177)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,8 +271,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args['changeset_uuid'] = wp_generate_uuid4();
</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">- // The theme and messenger_channel should be supplied via $args,
- // but they are also looked at in the $_REQUEST global here for back-compat.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * The theme and messenger_channel should be supplied via $args,
+ * but they are also looked at in the $_REQUEST global here for back-compat.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $args['theme'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST['customize_theme'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args['theme'] = wp_unslash( $_REQUEST['customize_theme'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -565,8 +567,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Once the theme is loaded, we'll validate it.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'after_setup_theme', array( $this, 'after_setup_theme' ) );
</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">- // If the requested theme is not the active theme and the user doesn't have
- // the switch_themes cap, bail.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If the requested theme is not the active theme and the user doesn't have
+ * the switch_themes cap, bail.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'switch_themes' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_die( -1, __( 'Sorry, you are not allowed to edit theme options on this site.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -905,8 +909,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function wp_loaded() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Unconditionally register core types for panels, sections, and controls
- // in case plugin unhooks all customize_register actions.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Unconditionally register core types for panels, sections, and controls
+ * in case plugin unhooks all customize_register actions.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->register_panel_type( 'WP_Customize_Panel' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->register_panel_type( 'WP_Customize_Themes_Panel' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->register_section_type( 'WP_Customize_Section' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5269,8 +5275,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Input type: checkbox.
- // With custom value.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Input type: checkbox, with custom value.
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->add_control(
</span><span class="cx" style="display: block; padding: 0 10px"> 'display_header_text',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5293,8 +5298,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Input type: color.
- // With sanitize_callback.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Input type: color, with sanitize_callback.
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->add_setting(
</span><span class="cx" style="display: block; padding: 0 10px"> 'background_color',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5602,8 +5606,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">- // If the theme is using the default background callback, we can update
- // the background CSS using postMessage.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If the theme is using the default background callback, we can update
+ * the background CSS using postMessage.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( get_theme_support( 'custom-background', 'wp-head-callback' ) === '_custom_background_cb' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'color', 'image', 'preset', 'position_x', 'position_y', 'size', 'repeat', 'attachment' ) as $prop ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->get_setting( 'background_' . $prop )->transport = 'postMessage';
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpeditorphp"></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-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-editor.php 2023-07-09 20:05:43 UTC (rev 56176)
+++ trunk/src/wp-includes/class-wp-editor.php 2023-07-09 20:15:03 UTC (rev 56177)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -458,8 +458,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $key = array_search( 'spellchecker', $plugins, true );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $key ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Remove 'spellchecker' from the internal plugins if added with 'tiny_mce_plugins' filter to prevent errors.
- // It can be added with 'mce_external_plugins'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Remove 'spellchecker' from the internal plugins if added with 'tiny_mce_plugins' filter to prevent errors.
+ * It can be added with 'mce_external_plugins'.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $plugins[ $key ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpembedphp"></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-embed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-embed.php 2023-07-09 20:05:43 UTC (rev 56176)
+++ trunk/src/wp-includes/class-wp-embed.php 2023-07-09 20:15:03 UTC (rev 56177)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -212,8 +212,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->last_attr = $attr;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // KSES converts & into & and we need to undo this.
- // See https://core.trac.wordpress.org/ticket/11311
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * KSES converts & into & and we need to undo this.
+ * See https://core.trac.wordpress.org/ticket/11311
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = str_replace( '&', '&', $url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Look for known internal handlers.
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpimageeditorgdphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-image-editor-gd.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-image-editor-gd.php 2023-07-09 20:05:43 UTC (rev 56176)
+++ trunk/src/wp-includes/class-wp-image-editor-gd.php 2023-07-09 20:15:03 UTC (rev 56177)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -324,8 +324,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return true|WP_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function crop( $src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If destination width/height isn't specified,
- // use same as width/height from source.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If destination width/height isn't specified,
+ * use same as width/height from source.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $dst_w ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $dst_w = $src_w;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>