From 7eec58966d7d74c0a8dba54fc07caf7571f6017c Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 5 Dec 2023 13:39:28 +0000
Subject: [PATCH] Administration: Don't unnecessarily escape `none` or `div` in
 the admin menu.

This matches a similar conditional in `wp-admin/menu-header.php`, where these values are handled as special cases and don't output the default menu image so that an icon could be added to `div.wp-menu-image` as CSS background.

Follow-up to [9578], [21877], [26664].

Props andrewleap, ironprogrammer, azaozz.
Fixes #58361.
Built from https://develop.svn.wordpress.org/trunk@57159


git-svn-id: http://core.svn.wordpress.org/trunk@56670 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/menu.php       | 7 +++++--
 wp-includes/version.php | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index 567af4ae40..71fd94b2e3 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -127,8 +127,11 @@ foreach ( array_merge( $builtin, $types ) as $ptype ) {
 
 	$menu_icon = 'dashicons-admin-post';
 	if ( is_string( $ptype_obj->menu_icon ) ) {
-		// Special handling for data:image/svg+xml and Dashicons.
-		if ( str_starts_with( $ptype_obj->menu_icon, 'data:image/svg+xml;base64,' ) || str_starts_with( $ptype_obj->menu_icon, 'dashicons-' ) ) {
+		// Special handling for an empty div.wp-menu-image, data:image/svg+xml, and Dashicons.
+		if ( 'none' === $ptype_obj->menu_icon || 'div' === $ptype_obj->menu_icon
+			|| str_starts_with( $ptype_obj->menu_icon, 'data:image/svg+xml;base64,' )
+			|| str_starts_with( $ptype_obj->menu_icon, 'dashicons-' )
+		) {
 			$menu_icon = $ptype_obj->menu_icon;
 		} else {
 			$menu_icon = esc_url( $ptype_obj->menu_icon );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index be31898fa9..6e78372d43 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.5-alpha-57158';
+$wp_version = '6.5-alpha-57159';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.