<!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>[55636] branches/6.2/src/wp-includes: Coding Standards: Apply various alignment corrections from `composer format`.</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/55636">55636</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/55636","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>2023-04-08 09:19:29 +0000 (Sat, 08 Apr 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'>Coding Standards: Apply various alignment corrections from `composer format`.
This fixes a few WPCS warnings along the lines of:
* Array double arrow not aligned correctly
* Equals sign not aligned with surrounding statements
* Usage of ELSE IF is discouraged; use ELSEIF instead
Follow-up to <a href="https://core.trac.wordpress.org/changeset/55099">[55099]</a>, <a href="https://core.trac.wordpress.org/changeset/55192">[55192]</a>, <a href="https://core.trac.wordpress.org/changeset/55194">[55194]</a>, <a href="https://core.trac.wordpress.org/changeset/55271">[55271]</a>.
Props davidbaumwald, jrf, SergeyBiryukov.
Merges <a href="https://core.trac.wordpress.org/changeset/55606">[55606]</a> to the 6.2 branch.
Fixes <a href="https://core.trac.wordpress.org/ticket/57994">#57994</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches62srcwpadminusereditphp">branches/6.2/src/wp-admin/user-edit.php</a></li>
<li><a href="#branches62srcwpincludesblocktemplateutilsphp">branches/6.2/src/wp-includes/block-template-utils.php</a></li>
<li><a href="#branches62srcwpincludesrestapiendpointsclasswprestglobalstylescontrollerphp">branches/6.2/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php</a></li>
<li><a href="#branches62srcwpincludesscriptloaderphp">branches/6.2/src/wp-includes/script-loader.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches62">branches/6.2/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/6.2
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/6.2 2023-04-08 09:15:21 UTC (rev 55635)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/6.2 2023-04-08 09:19:29 UTC (rev 55636)
</ins><a id="branches62"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/6.2</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.8:51889
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:55508,55542,55544-55545,55547,55568,55573-55574,55584,55598,55600-55601,55632
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:55508,55542,55544-55545,55547,55568,55573-55574,55584,55598,55600-55601,55606,55632
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches62srcwpadminusereditphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.2/src/wp-admin/user-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.2/src/wp-admin/user-edit.php 2023-04-08 09:15:21 UTC (rev 55635)
+++ branches/6.2/src/wp-admin/user-edit.php 2023-04-08 09:19:29 UTC (rev 55636)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -349,7 +349,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $languages = get_available_languages();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $languages = get_available_languages();
</ins><span class="cx" style="display: block; padding: 0 10px"> $can_install_translations = current_user_can( 'install_languages' ) && wp_can_install_language_pack();
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $languages || $can_install_translations ) : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -370,12 +370,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_dropdown_languages(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => 'locale',
- 'id' => 'locale',
- 'selected' => $user_locale,
- 'languages' => $languages,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => 'locale',
+ 'id' => 'locale',
+ 'selected' => $user_locale,
+ 'languages' => $languages,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_available_translations' => $can_install_translations,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'show_option_site_default' => true,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'show_option_site_default' => true,
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span></span></pre></div>
<a id="branches62srcwpincludesblocktemplateutilsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.2/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.2/src/wp-includes/block-template-utils.php 2023-04-08 09:15:21 UTC (rev 55635)
+++ branches/6.2/src/wp-includes/block-template-utils.php 2023-04-08 09:19:29 UTC (rev 55636)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1338,9 +1338,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $slug !== $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $template_hierarchy[] = $type;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( preg_match( '/^(author|category|archive|tag|page)-.+$/', $slug, $matches ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( preg_match( '/^(author|category|archive|tag|page)-.+$/', $slug, $matches ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $template_hierarchy[] = $matches[1];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( preg_match( '/^(taxonomy|single)-(.+)$/', $slug, $matches ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( preg_match( '/^(taxonomy|single)-(.+)$/', $slug, $matches ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $type = $matches[1];
</span><span class="cx" style="display: block; padding: 0 10px"> $slug_remaining = $matches[2];
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches62srcwpincludesrestapiendpointsclasswprestglobalstylescontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.2/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.2/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php 2023-04-08 09:15:21 UTC (rev 55635)
+++ branches/6.2/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php 2023-04-08 09:19:29 UTC (rev 55636)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,7 +272,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $changes;
</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">- $result = wp_update_post( wp_slash( (array) $changes ), true, false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $result = wp_update_post( wp_slash( (array) $changes ), true, false );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $result ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $result;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches62srcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.2/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.2/src/wp-includes/script-loader.php 2023-04-08 09:15:21 UTC (rev 55635)
+++ branches/6.2/src/wp-includes/script-loader.php 2023-04-08 09:19:29 UTC (rev 55636)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1108,9 +1108,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'mediaelement-vimeo', '/wp-includes/js/mediaelement/renderers/vimeo.min.js', array( 'mediaelement' ), '4.2.17', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement$suffix.js", array( 'mediaelement' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $mejs_settings = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'pluginPath' => includes_url( 'js/mediaelement/', 'relative' ),
- 'classPrefix' => 'mejs-',
- 'stretching' => 'responsive',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'pluginPath' => includes_url( 'js/mediaelement/', 'relative' ),
+ 'classPrefix' => 'mejs-',
+ 'stretching' => 'responsive',
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/media.php */
</span><span class="cx" style="display: block; padding: 0 10px"> 'audioShortcodeLibrary' => apply_filters( 'wp_audio_shortcode_library', 'mediaelement' ),
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/media.php */
</span></span></pre>
</div>
</div>
</body>
</html>