<!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>[54753] branches/6.1/src/wp-includes: Coding Standards: Revert [54752] from the 6.1 branch.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/54753">54753</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/54753","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>2022-11-05 21:59:35 +0000 (Sat, 05 Nov 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Coding Standards: Revert <a href="https://core.trac.wordpress.org/changeset/54752">[54752]</a> from the 6.1 branch.
This was supposed to be committed to trunk.
See <a href="https://core.trac.wordpress.org/ticket/56791">#56791</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches61srcwpincludesblocktemplateutilsphp">branches/6.1/src/wp-includes/block-template-utils.php</a></li>
<li><a href="#branches61srcwpincludesclasswpoembedphp">branches/6.1/src/wp-includes/class-wp-oembed.php</a></li>
<li><a href="#branches61srcwpincludesfunctionsphp">branches/6.1/src/wp-includes/functions.php</a></li>
<li><a href="#branches61srcwpincludesrestapiendpointsclasswprestpostscontrollerphp">branches/6.1/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php</a></li>
<li><a href="#branches61srcwpincludesscriptloaderphp">branches/6.1/src/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches61srcwpincludesblocktemplateutilsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/src/wp-includes/block-template-utils.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/src/wp-includes/block-template-utils.php 2022-11-05 17:28:48 UTC (rev 54752)
+++ branches/6.1/src/wp-includes/block-template-utils.php 2022-11-05 21:59:35 UTC (rev 54753)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -556,11 +556,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'no_found_rows' => true,
</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">- $args = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => $slug,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args = wp_parse_args( $args, $default_args );
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args = wp_parse_args( $args, $default_args );
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts_query = new WP_Query( $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $posts_query->posts ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -592,8 +591,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => $post_title,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args = wp_parse_args( $args, $default_args );
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args = wp_parse_args( $args, $default_args );
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts_with_same_title_query = new WP_Query( $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( count( $posts_with_same_title_query->posts ) > 1 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -632,12 +630,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term_query = new WP_Term_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">- $args = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'number' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => $slug,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args = wp_parse_args( $args, $default_args );
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args = wp_parse_args( $args, $default_args );
</ins><span class="cx" style="display: block; padding: 0 10px"> $terms_query = $term_query->query( $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $terms_query->terms ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -671,8 +668,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'number' => 2,
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => $term_title,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args = wp_parse_args( $args, $default_args );
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args = wp_parse_args( $args, $default_args );
</ins><span class="cx" style="display: block; padding: 0 10px"> $terms_with_same_title_query = $term_query->query( $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( count( $terms_with_same_title_query->terms ) > 1 ) {
</span></span></pre></div>
<a id="branches61srcwpincludesclasswpoembedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/src/wp-includes/class-wp-oembed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/src/wp-includes/class-wp-oembed.php 2022-11-05 17:28:48 UTC (rev 54752)
+++ branches/6.1/src/wp-includes/class-wp-oembed.php 2022-11-05 21:59:35 UTC (rev 54753)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +80,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '#https?://(www\.)?mixcloud\.com/.*#i' => array( 'https://www.mixcloud.com/oembed', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> '#https?://(www\.|embed\.)?ted\.com/talks/.*#i' => array( 'https://www.ted.com/services/v1/oembed.{format}', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> '#https?://(www\.)?(animoto|video214)\.com/play/.*#i' => array( 'https://animoto.com/oembeds/create', true ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '#https?://(.+)\.tumblr\.com/.*#i' => array( 'https://www.tumblr.com/oembed/1.0', true ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '#https?://(.+)\.tumblr\.com/.*#i' => array( 'https://www.tumblr.com/oembed/1.0', true ),
</ins><span class="cx" style="display: block; padding: 0 10px"> '#https?://(www\.)?kickstarter\.com/projects/.*#i' => array( 'https://www.kickstarter.com/services/oembed', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> '#https?://kck\.st/.*#i' => array( 'https://www.kickstarter.com/services/oembed', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> '#https?://cloudup\.com/.*#i' => array( 'https://cloudup.com/oembed', true ),
</span></span></pre></div>
<a id="branches61srcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/src/wp-includes/functions.php 2022-11-05 17:28:48 UTC (rev 54752)
+++ branches/6.1/src/wp-includes/functions.php 2022-11-05 21:59:35 UTC (rev 54753)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3567,12 +3567,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'You are attempting to log out of %s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> get_bloginfo( 'name' )
</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">+ $html = $title;
+ $html .= '</p><p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> $redirect_to = isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $html = $title;
- $html .= '</p><p>';
- $html .= sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $html .= sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Logout URL. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Do you really want to <a href="%s">log out</a>?' ),
</span><span class="cx" style="display: block; padding: 0 10px"> wp_logout_url( $redirect_to )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3579,11 +3577,9 @@
</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"> $html = __( 'The link you followed has expired.' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( wp_get_referer() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_http_referer = remove_query_arg( 'updated', wp_get_referer() );
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_http_referer = wp_validate_redirect( esc_url_raw( $wp_http_referer ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> $html .= '</p><p>';
</span><span class="cx" style="display: block; padding: 0 10px"> $html .= sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%s">%s</a>',
</span></span></pre></div>
<a id="branches61srcwpincludesrestapiendpointsclasswprestpostscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php 2022-11-05 17:28:48 UTC (rev 54752)
+++ branches/6.1/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php 2022-11-05 21:59:35 UTC (rev 54753)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2890,9 +2890,9 @@
</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"> $query_params['slug'] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'description' => __( 'Limit result set to posts with one or more specific slugs.' ),
- 'type' => 'array',
- 'items' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'description' => __( 'Limit result set to posts with one or more specific slugs.' ),
+ 'type' => 'array',
+ 'items' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'string',
</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="branches61srcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/src/wp-includes/script-loader.php 2022-11-05 17:28:48 UTC (rev 54752)
+++ branches/6.1/src/wp-includes/script-loader.php 2022-11-05 21:59:35 UTC (rev 54753)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3686,8 +3686,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( WP_Theme_JSON_Resolver::theme_has_support() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $editor_settings;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $suffix = wp_scripts_get_suffix();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $suffix = wp_scripts_get_suffix();
</ins><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><span class="cx" style="display: block; padding: 0 10px"> // This follows the pattern of get_block_editor_theme_styles,
</span></span></pre>
</div>
</div>
</body>
</html>