From 65df00224c3234ac8a5a8145b06805820d97df84 Mon Sep 17 00:00:00 2001 From: Nasser Rafie Date: Tue, 2 Dec 2025 02:44:35 +0330 Subject: [PATCH 1/3] fixes trac#64330 --- src/wp-admin/includes/class-wp-ms-sites-list-table.php | 3 ++- src/wp-admin/includes/template.php | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/wp-admin/includes/class-wp-ms-sites-list-table.php b/src/wp-admin/includes/class-wp-ms-sites-list-table.php index 6097f5e13ecd4..e472c880d7556 100644 --- a/src/wp-admin/includes/class-wp-ms-sites-list-table.php +++ b/src/wp-admin/includes/class-wp-ms-sites-list-table.php @@ -676,13 +676,14 @@ protected function site_states( $site ) { $state_count = count( $site_states ); $i = 0; + $s = wp_get_list_item_separator(); echo ' — '; foreach ( $site_states as $state ) { ++$i; - $separator = ( $i < $state_count ) ? ', ' : ''; + $separator = ( $i < $state_count ) ? $s : ''; echo "{$state}{$separator}"; } diff --git a/src/wp-admin/includes/template.php b/src/wp-admin/includes/template.php index 1c86a2a9d0334..55d544fdba920 100644 --- a/src/wp-admin/includes/template.php +++ b/src/wp-admin/includes/template.php @@ -2253,13 +2253,14 @@ function _post_states( $post, $display = true ) { $state_count = count( $post_states ); $i = 0; + $s = wp_get_list_item_separator(); $post_states_html .= ' — '; foreach ( $post_states as $state ) { ++$i; - $separator = ( $i < $state_count ) ? ', ' : ''; + $separator = ( $i < $state_count ) ? $s : ''; $post_states_html .= "{$state}{$separator}"; } @@ -2381,13 +2382,14 @@ function _media_states( $post, $display = true ) { $state_count = count( $media_states ); $i = 0; + $s = wp_get_list_item_separator(); $media_states_string .= ' — '; foreach ( $media_states as $state ) { ++$i; - $separator = ( $i < $state_count ) ? ', ' : ''; + $separator = ( $i < $state_count ) ? $s : ''; $media_states_string .= "{$state}{$separator}"; } From 875b6eaf5920a0601b17324d5aa0982042212540 Mon Sep 17 00:00:00 2001 From: Nasser Rafie Date: Tue, 2 Dec 2025 04:27:26 +0330 Subject: [PATCH 2/3] Revert "fixes trac#64330" This reverts commit 65df00224c3234ac8a5a8145b06805820d97df84. --- src/wp-admin/includes/class-wp-ms-sites-list-table.php | 3 +-- src/wp-admin/includes/template.php | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/wp-admin/includes/class-wp-ms-sites-list-table.php b/src/wp-admin/includes/class-wp-ms-sites-list-table.php index e472c880d7556..6097f5e13ecd4 100644 --- a/src/wp-admin/includes/class-wp-ms-sites-list-table.php +++ b/src/wp-admin/includes/class-wp-ms-sites-list-table.php @@ -676,14 +676,13 @@ protected function site_states( $site ) { $state_count = count( $site_states ); $i = 0; - $s = wp_get_list_item_separator(); echo ' — '; foreach ( $site_states as $state ) { ++$i; - $separator = ( $i < $state_count ) ? $s : ''; + $separator = ( $i < $state_count ) ? ', ' : ''; echo "{$state}{$separator}"; } diff --git a/src/wp-admin/includes/template.php b/src/wp-admin/includes/template.php index 55d544fdba920..1c86a2a9d0334 100644 --- a/src/wp-admin/includes/template.php +++ b/src/wp-admin/includes/template.php @@ -2253,14 +2253,13 @@ function _post_states( $post, $display = true ) { $state_count = count( $post_states ); $i = 0; - $s = wp_get_list_item_separator(); $post_states_html .= ' — '; foreach ( $post_states as $state ) { ++$i; - $separator = ( $i < $state_count ) ? $s : ''; + $separator = ( $i < $state_count ) ? ', ' : ''; $post_states_html .= "{$state}{$separator}"; } @@ -2382,14 +2381,13 @@ function _media_states( $post, $display = true ) { $state_count = count( $media_states ); $i = 0; - $s = wp_get_list_item_separator(); $media_states_string .= ' — '; foreach ( $media_states as $state ) { ++$i; - $separator = ( $i < $state_count ) ? $s : ''; + $separator = ( $i < $state_count ) ? ', ' : ''; $media_states_string .= "{$state}{$separator}"; } From e5231b1dcc69a451ac65cee6ec37b2728b9dffc3 Mon Sep 17 00:00:00 2001 From: Nasser Rafie Date: Tue, 2 Dec 2025 04:31:35 +0330 Subject: [PATCH 3/3] fixes trac#64330 --- src/wp-admin/includes/class-wp-ms-sites-list-table.php | 5 +++-- src/wp-admin/includes/template.php | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/wp-admin/includes/class-wp-ms-sites-list-table.php b/src/wp-admin/includes/class-wp-ms-sites-list-table.php index 6097f5e13ecd4..f2df9b43fed1a 100644 --- a/src/wp-admin/includes/class-wp-ms-sites-list-table.php +++ b/src/wp-admin/includes/class-wp-ms-sites-list-table.php @@ -674,6 +674,7 @@ protected function site_states( $site ) { if ( ! empty( $site_states ) ) { $state_count = count( $site_states ); + $separator = wp_get_list_item_separator(); $i = 0; @@ -682,9 +683,9 @@ protected function site_states( $site ) { foreach ( $site_states as $state ) { ++$i; - $separator = ( $i < $state_count ) ? ', ' : ''; + $suffix = ( $i < $state_count ) ? $separator : ''; - echo "{$state}{$separator}"; + echo "{$state}{$suffix}"; } } } diff --git a/src/wp-admin/includes/template.php b/src/wp-admin/includes/template.php index 1c86a2a9d0334..b607e71d75c2c 100644 --- a/src/wp-admin/includes/template.php +++ b/src/wp-admin/includes/template.php @@ -2251,6 +2251,7 @@ function _post_states( $post, $display = true ) { if ( ! empty( $post_states ) ) { $state_count = count( $post_states ); + $separator = wp_get_list_item_separator(); $i = 0; @@ -2259,9 +2260,9 @@ function _post_states( $post, $display = true ) { foreach ( $post_states as $state ) { ++$i; - $separator = ( $i < $state_count ) ? ', ' : ''; + $suffix = ( $i < $state_count ) ? $separator : ''; - $post_states_html .= "{$state}{$separator}"; + $post_states_html .= "{$state}{$suffix}"; } } @@ -2379,6 +2380,7 @@ function _media_states( $post, $display = true ) { if ( ! empty( $media_states ) ) { $state_count = count( $media_states ); + $separator = wp_get_list_item_separator(); $i = 0; @@ -2387,9 +2389,9 @@ function _media_states( $post, $display = true ) { foreach ( $media_states as $state ) { ++$i; - $separator = ( $i < $state_count ) ? ', ' : ''; + $suffix = ( $i < $state_count ) ? $separator : ''; - $media_states_string .= "{$state}{$separator}"; + $media_states_string .= "{$state}{$suffix}"; } }