From f7f020b35ed71bd3151cf4907d6cc7b3bc3dcdaf Mon Sep 17 00:00:00 2001 From: Huzaifa Al Mesbah Date: Sun, 8 Mar 2026 23:08:28 +0600 Subject: [PATCH 1/6] Admin & Customizer: Fix type casting for version string and aria-pressed attribute --- src/wp-admin/admin-header.php | 2 +- src/wp-admin/customize.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wp-admin/admin-header.php b/src/wp-admin/admin-header.php index e1e9ba0f6562b..3471cd97e170a 100644 --- a/src/wp-admin/admin-header.php +++ b/src/wp-admin/admin-header.php @@ -191,7 +191,7 @@ $admin_body_class .= ' taxonomy-' . $current_screen->taxonomy; } -$admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', (float) get_bloginfo( 'version' ) ); +$admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', (string) get_bloginfo( 'version' ) ); $admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', get_bloginfo( 'version' ) ) ); $admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'modern' ); $admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) ); diff --git a/src/wp-admin/customize.php b/src/wp-admin/customize.php index 2065e55ffb3ce..7434e2eb18b25 100644 --- a/src/wp-admin/customize.php +++ b/src/wp-admin/customize.php @@ -288,7 +288,7 @@ $class .= ' active'; } ?> - From 29c05083abd8ff052c3cbcda26bbc858145356d0 Mon Sep 17 00:00:00 2001 From: Huzaifa Al Mesbah Date: Sun, 8 Mar 2026 23:52:37 +0600 Subject: [PATCH 2/6] Update src/wp-admin/admin-header.php Co-authored-by: Christoph Daum --- src/wp-admin/admin-header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wp-admin/admin-header.php b/src/wp-admin/admin-header.php index 3471cd97e170a..9cf53aa4cdbee 100644 --- a/src/wp-admin/admin-header.php +++ b/src/wp-admin/admin-header.php @@ -191,7 +191,7 @@ $admin_body_class .= ' taxonomy-' . $current_screen->taxonomy; } -$admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', (string) get_bloginfo( 'version' ) ); +$admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', (string) ( (float) get_bloginfo( 'version' ) ) ); $admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', get_bloginfo( 'version' ) ) ); $admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'modern' ); $admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) ); From a8ac39c3dd8c129a12a8e8963c79326990b19332 Mon Sep 17 00:00:00 2001 From: Huzaifa Al Mesbah Date: Sun, 8 Mar 2026 23:57:17 +0600 Subject: [PATCH 3/6] Coding standards: Fix extra space after cast statement --- src/wp-admin/admin-header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wp-admin/admin-header.php b/src/wp-admin/admin-header.php index 9cf53aa4cdbee..37a572433d320 100644 --- a/src/wp-admin/admin-header.php +++ b/src/wp-admin/admin-header.php @@ -191,7 +191,7 @@ $admin_body_class .= ' taxonomy-' . $current_screen->taxonomy; } -$admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', (string) ( (float) get_bloginfo( 'version' ) ) ); +$admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', (string) ( (float) get_bloginfo( 'version' ) ) ); $admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', get_bloginfo( 'version' ) ) ); $admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'modern' ); $admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) ); From 539a3304927c1333bdbdba6e4fcd2a9b30015803 Mon Sep 17 00:00:00 2001 From: Huzaifa Al Mesbah Date: Mon, 9 Mar 2026 10:03:54 +0600 Subject: [PATCH 4/6] Apply suggestion from @westonruter Co-authored-by: Weston Ruter --- src/wp-admin/customize.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wp-admin/customize.php b/src/wp-admin/customize.php index 7434e2eb18b25..5471a98c5b289 100644 --- a/src/wp-admin/customize.php +++ b/src/wp-admin/customize.php @@ -288,7 +288,7 @@ $class .= ' active'; } ?> - From 1aca6167592f5c4ad9d9d6e1ad2c3b0a8d26c6a1 Mon Sep 17 00:00:00 2001 From: Huzaifa Al Mesbah Date: Mon, 9 Mar 2026 12:16:41 +0600 Subject: [PATCH 5/6] Admin: Fix version parsing for admin body class --- src/wp-admin/admin-header.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/wp-admin/admin-header.php b/src/wp-admin/admin-header.php index 37a572433d320..a3b78ae29b480 100644 --- a/src/wp-admin/admin-header.php +++ b/src/wp-admin/admin-header.php @@ -191,8 +191,17 @@ $admin_body_class .= ' taxonomy-' . $current_screen->taxonomy; } -$admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', (string) ( (float) get_bloginfo( 'version' ) ) ); -$admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', get_bloginfo( 'version' ) ) ); +$version_without_tag = strtok( get_bloginfo( 'version' ), '-' ); +$version_components = explode( '.', $version_without_tag ); +$version_class = 'version-' . implode( '-', $version_components ); +$admin_body_class .= ' ' . $version_class; + +$branch_version_components = array_slice( $version_components, 0, 2 ); +if ( '0' === array_last( $branch_version_components ) ) { + array_pop( $branch_version_components ); +} +$branch_class = 'branch-' . implode( '-', $branch_version_components ); +$admin_body_class .= ' ' . $branch_class; $admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'modern' ); $admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) ); From b5c2bf567c738d0d8c0c609e7efd0a6f49202be3 Mon Sep 17 00:00:00 2001 From: Huzaifa Al Mesbah Date: Mon, 9 Mar 2026 12:19:45 +0600 Subject: [PATCH 6/6] Coding standards: Remove unnecessary blank line --- src/wp-admin/admin-header.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/wp-admin/admin-header.php b/src/wp-admin/admin-header.php index a3b78ae29b480..9de7b244b4cd5 100644 --- a/src/wp-admin/admin-header.php +++ b/src/wp-admin/admin-header.php @@ -195,7 +195,6 @@ $version_components = explode( '.', $version_without_tag ); $version_class = 'version-' . implode( '-', $version_components ); $admin_body_class .= ' ' . $version_class; - $branch_version_components = array_slice( $version_components, 0, 2 ); if ( '0' === array_last( $branch_version_components ) ) { array_pop( $branch_version_components );