Changeset 57159

Timestamp:

12/05/2023 01:37:52 PM (8 months ago)

Author:

SergeyBiryukov

Message:

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.

File:

• trunk/src/wp-admin/menu.php (modified) (1 diff)

trunk/src/wp-admin/menu.php

@@ -128 +128 @@
     $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 {