Changeset 51873

Timestamp:

09/27/2021 12:35:38 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Remove duplicate assignment from a ternary operator in WP_MS_Sites_List_Table::site_states().

Adjust similar code in _post_states() and _media_states() for consistency.

Follow-up to:

• [12897], [15491], [32755], [46153], [48424] for WP_MS_Sites_List_Table::site_states().
• [17793], [47775], [49223] for _media_states().
• [9153], [46309] for _post_states().

Props joelcj91, audrasjb, desrosj.
Fixes #38296.

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-ms-sites-list-table.php (modified) (1 diff)
• template.php (modified) (2 diffs)

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

@@ -644 +644 @@
         if ( ! empty( $site_states ) ) {
             $state_count = count( $site_states );
-            $i           = 0;
+
+            $i = 0;
+
             echo ' — ';
+
             foreach ( $site_states as $state ) {
                 ++$i;
-                ( $i == $state_count ) ? $sep = '' : $sep = ', ';
+
+                $sep = ( $i < $state_count ) ? ', ' : '';
+
                 echo "<span class='post-state'>{$state}{$sep}</span>";
             }

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

@@ -2146 +2146 @@
     if ( ! empty( $post_states ) ) {
         $state_count = count( $post_states );
-        $i           = 0;
+
+        $i = 0;
 
         $post_states_string .= ' — ';
 
         foreach ( $post_states as $state ) {
-            $sep = ( ++$i === $state_count ) ? '' : ', ';
+            ++$i;
+
+            $sep = ( $i < $state_count ) ? ', ' : '';
 
             $post_states_string .= "<span class='post-state'>$state$sep</span>";
@@ -2256 +2259 @@
     if ( ! empty( $media_states ) ) {
         $state_count = count( $media_states );
-        $i           = 0;
+
+        $i = 0;
 
         $media_states_string .= ' &mdash; ';
 
         foreach ( $media_states as $state ) {
-            $sep = ( ++$i === $state_count ) ? '' : ', ';
+            ++$i;
+
+            $sep = ( $i < $state_count ) ? ', ' : '';
 
             $media_states_string .= "<span class='post-state'>$state$sep</span>";