<!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>[58129] trunk: Posts, Post Types: Use a consistent plural form of {U+201C}status{U+201D} in variable names.</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/58129">58129</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/58129","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>2024-05-10 18:07:17 +0000 (Fri, 10 May 2024)</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'>Posts, Post Types: Use a consistent plural form of {U+201C}status{U+201D} in variable names.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/5575">[5575]</a>, <a href="https://core.trac.wordpress.org/changeset/6796">[6796]</a>, <a href="https://core.trac.wordpress.org/changeset/6993">[6993]</a>, <a href="https://core.trac.wordpress.org/changeset/7638">[7638]</a>, <a href="https://core.trac.wordpress.org/changeset/12162">[12162]</a>, <a href="https://core.trac.wordpress.org/changeset/12719">[12719]</a>, <a href="https://core.trac.wordpress.org/changeset/15578">[15578]</a>, <a href="https://core.trac.wordpress.org/changeset/16652">[16652]</a>, <a href="https://core.trac.wordpress.org/changeset/31046">[31046]</a>, <a href="https://core.trac.wordpress.org/changeset/34515">[34515]</a>, <a href="https://core.trac.wordpress.org/changeset/49472">[49472]</a>.
Props Presskopp, sabernhardt, manfcarlo, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/58134">#58134</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminexportphp">trunk/src/wp-admin/export.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpcommentslisttablephp">trunk/src/wp-admin/includes/class-wp-comments-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesmetaboxesphp">trunk/src/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.php</a></li>
<li><a href="#trunktestsphpunittestsincludeshelpersphp">trunk/tests/phpunit/tests/includes/helpers.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminexportphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/export.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/export.php 2024-05-10 11:46:51 UTC (rev 58128)
+++ trunk/src/wp-admin/export.php 2024-05-10 18:07:17 UTC (rev 58129)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,8 +238,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <select name="post_status" id="post-status">
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="0"><?php _e( 'All' ); ?></option>
</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">- $post_stati = get_post_stati( array( 'internal' => false ), 'objects' );
- foreach ( $post_stati as $status ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_statuses = get_post_stati( array( 'internal' => false ), 'objects' );
+ foreach ( $post_statuses as $status ) :
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="<?php echo esc_attr( $status->name ); ?>"><?php echo esc_html( $status->label ); ?></option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -289,7 +289,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="page-status" class="label-responsive"><?php _e( 'Status:' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <select name="page_status" id="page-status">
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="0"><?php _e( 'All' ); ?></option>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php foreach ( $post_stati as $status ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php foreach ( $post_statuses as $status ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <option value="<?php echo esc_attr( $status->name ); ?>"><?php echo esc_html( $status->label ); ?></option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpcommentslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-comments-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2024-05-10 11:46:51 UTC (rev 58128)
+++ trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2024-05-10 18:07:17 UTC (rev 58129)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,7 +237,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $status_links = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $num_comments = ( $post_id ) ? wp_count_comments( $post_id ) : wp_count_comments();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $stati = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $statuses = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Number of comments. */
</span><span class="cx" style="display: block; padding: 0 10px"> 'all' => _nx_noop(
</span><span class="cx" style="display: block; padding: 0 10px"> 'All <span class="count">(%s)</span>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,7 +282,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"> if ( ! EMPTY_TRASH_DAYS ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $stati['trash'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $statuses['trash'] );
</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"> $link = admin_url( 'edit-comments.php' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -291,7 +291,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $link = add_query_arg( 'comment_type', $comment_type, $link );
</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">- foreach ( $stati as $status => $label ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $statuses as $status => $label ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'mine' === $status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $current_user_id = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> $num_comments->mine = get_comments(
</span></span></pre></div>
<a id="trunksrcwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/meta-boxes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/meta-boxes.php 2024-05-10 11:46:51 UTC (rev 58128)
+++ trunk/src/wp-admin/includes/meta-boxes.php 2024-05-10 18:07:17 UTC (rev 58129)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1679,13 +1679,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_meta_box( 'commentstatusdiv', __( 'Discussion' ), 'post_comment_status_meta_box', null, 'normal', 'core', array( '__back_compat_meta_box' => 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">- $stati = get_post_stati( array( 'public' => true ) );
- if ( empty( $stati ) ) {
- $stati = array( 'publish' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $statuses = get_post_stati( array( 'public' => true ) );
+
+ if ( empty( $statuses ) ) {
+ $statuses = array( 'publish' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $stati[] = 'private';
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( get_post_status( $post ), $stati, true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $statuses[] = 'private';
+
+ if ( in_array( get_post_status( $post ), $statuses, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * If the post type support comments, or the post has comments,
</span><span class="cx" style="display: block; padding: 0 10px"> * allow the Comments meta box.
</span></span></pre></div>
<a id="trunksrcwpadminincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/post.php 2024-05-10 11:46:51 UTC (rev 58128)
+++ trunk/src/wp-admin/includes/post.php 2024-05-10 18:07:17 UTC (rev 58129)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1199,9 +1199,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string[] An array of all the statuses for the supplied post type.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_available_post_statuses( $type = 'post' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $stati = wp_count_posts( $type );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $statuses = wp_count_posts( $type );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return array_keys( get_object_vars( $stati ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return array_keys( get_object_vars( $statuses ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1217,10 +1217,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $q ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $q = $_GET;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $q['m'] = isset( $q['m'] ) ? (int) $q['m'] : 0;
- $q['cat'] = isset( $q['cat'] ) ? (int) $q['cat'] : 0;
- $post_stati = get_post_stati();
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $q['m'] = isset( $q['m'] ) ? (int) $q['m'] : 0;
+ $q['cat'] = isset( $q['cat'] ) ? (int) $q['cat'] : 0;
+
+ $post_statuses = get_post_stati();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $q['post_type'] ) && in_array( $q['post_type'], get_post_types(), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = $q['post_type'];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1231,7 +1233,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_status = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $perm = '';
</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 ( isset( $q['post_status'] ) && in_array( $q['post_status'], $post_stati, true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $q['post_status'] ) && in_array( $q['post_status'], $post_statuses, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_status = $q['post_status'];
</span><span class="cx" style="display: block; padding: 0 10px"> $perm = 'readable';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsincludeshelpersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/includes/helpers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/includes/helpers.php 2024-05-10 11:46:51 UTC (rev 58128)
+++ trunk/tests/phpunit/tests/includes/helpers.php 2024-05-10 18:07:17 UTC (rev 58129)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,9 +225,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status( 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px"> _unregister_post_status( 'foo' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $stati = get_post_stati();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $statuses = get_post_stati();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertArrayNotHasKey( 'foo', $stati );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertArrayNotHasKey( 'foo', $statuses );
</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>
</div>
</body>
</html>