Changeset 58129

Timestamp:

05/10/2024 06:07:17 PM (3 months ago)

Author:

SergeyBiryukov

Message:

Posts, Post Types: Use a consistent plural form of “status” in variable names.

Follow-up to [5575], [6796], [6993], [7638], [12162], [12719], [15578], [16652], [31046], [34515], [49472].

Props Presskopp, sabernhardt, manfcarlo, SergeyBiryukov.
Fixes #58134.

Location:

trunk

Files:

• src/wp-admin/export.php (modified) (2 diffs)
• src/wp-admin/includes/class-wp-comments-list-table.php (modified) (3 diffs)
• src/wp-admin/includes/meta-boxes.php (modified) (1 diff)
• src/wp-admin/includes/post.php (modified) (3 diffs)
• tests/phpunit/tests/includes/helpers.php (modified) (1 diff)

trunk/src/wp-admin/export.php

@@ -239 +239 @@
             <option value="0"><?php _e( 'All' ); ?></option>
             <?php
-            $post_stati = get_post_stati( array( 'internal' => false ), 'objects' );
-            foreach ( $post_stati as $status ) :
+            $post_stat = get_post_stati( array( 'internal' => false ), 'objects' );
+            foreach ( $post_stat as $status ) :
                 ?>
             <option value="<?php echo esc_attr( $status->name ); ?>"><?php echo esc_html( $status->label ); ?></option>
@@ -290 +290 @@
         <select name="page_status" id="page-status">
             <option value="0"><?php _e( 'All' ); ?></option>
-            <?php foreach ( $post_stati as $status ) : ?>
+            <?php foreach ( $post_stat as $status ) : ?>
             <option value="<?php echo esc_attr( $status->name ); ?>"><?php echo esc_html( $status->label ); ?></option>
             <?php endforeach; ?>

trunk/src/wp-admin/includes/class-wp-comments-list-table.php

@@ -238 +238 @@
         $num_comments = ( $post_id ) ? wp_count_comments( $post_id ) : wp_count_comments();
 
-        $stati = array(
+        $stat = array(
             /* translators: %s: Number of comments. */
             'all'       => _nx_noop(
@@ -283 +283 @@
 
         if ( ! EMPTY_TRASH_DAYS ) {
-            unset( $stati['trash'] );
+            unset( $stat['trash'] );
         }
 
@@ -292 +292 @@
         }
 
-        foreach ( $stati as $status => $label ) {
+        foreach ( $stat as $status => $label ) {
             if ( 'mine' === $status ) {
                 $current_user_id    = get_current_user_id();

trunk/src/wp-admin/includes/meta-boxes.php

@@ -1680 +1680 @@
     }
 
-    $stati = get_post_stati( array( 'public' => true ) );
-    if ( empty( $stati ) ) {
-        $stati = array( 'publish' );
-    }
-    $stati[] = 'private';
-
-    if ( in_array( get_post_status( $post ), $stati, true ) ) {
+    $statuses = get_post_stati( array( 'public' => true ) );
+
+    if ( empty( $statuses ) ) {
+        $statuses = array( 'publish' );
+    }
+
+    $statuses[] = 'private';
+
+    if ( in_array( get_post_status( $post ), $statuses, true ) ) {
         /*
          * If the post type support comments, or the post has comments,

trunk/src/wp-admin/includes/post.php

@@ -1200 +1200 @@
  */
 function get_available_post_statuses( $type = 'post' ) {
-    $stati = wp_count_posts( $type );
-
-    return array_keys( get_object_vars( $stati ) );
+    $stat = wp_count_posts( $type );
+
+    return array_keys( get_object_vars( $stat ) );
 }
 
@@ -1218 +1218 @@
         $q = $_GET;
     }
-    $q['m']     = isset( $q['m'] ) ? (int) $q['m'] : 0;
-    $q['cat']   = isset( $q['cat'] ) ? (int) $q['cat'] : 0;
-    $post_stati = get_post_stati();
+
+    $q['m']   = isset( $q['m'] ) ? (int) $q['m'] : 0;
+    $q['cat'] = isset( $q['cat'] ) ? (int) $q['cat'] : 0;
+
+    $post_statuses = get_post_stati();
 
     if ( isset( $q['post_type'] ) && in_array( $q['post_type'], get_post_types(), true ) ) {
@@ -1232 +1234 @@
     $perm             = '';
 
-    if ( isset( $q['post_status'] ) && in_array( $q['post_status'], $post_stati, true ) ) {
+    if ( isset( $q['post_status'] ) && in_array( $q['post_status'], $post_stat, true ) ) {
         $post_status = $q['post_status'];
         $perm        = 'readable';

trunk/tests/phpunit/tests/includes/helpers.php

@@ -226 +226 @@
         _unregister_post_status( 'foo' );
 
-        $stati = get_post_stati();
-
-        $this->assertArrayNotHasKey( 'foo', $stati );
+        $stat = get_post_stati();
+
+        $this->assertArrayNotHasKey( 'foo', $stat );
     }