Ticket #26922: admin-icon-fonts.26922.diff

src/wp-admin/menu-header.php

@@ -83 +83 @@
                 // so an icon can be added to div.wp-menu-image as background with CSS.
                 // Dashicons and base64-encoded data:image/svg_xml URIs are also handled as special cases.
                 if ( ! empty( $item[6] ) ) {
-                        $img = '<img src="' . $item[6] . '" alt="" />';
-
+                        $img_info = array( 'img' => '<img src="' . $item[6] . '" alt="" />', );
+                        
                         if ( 'none' === $item[6] || 'div' === $item[6] ) {
-                                $img = '<br />';
+                                $img_info['img'] = '<br />';
                         } elseif ( 0 === strpos( $item[6], 'data:image/svg+xml;base64,' ) ) {
-                                $img = '<br />';
-                                $img_style = ' style="background-image:url(\'' . esc_attr( $item[6] ) . '\')"';
-                                $img_class = ' svg';
+                                $img_info['img'] = '<br />';
+                                $img_info['img_style'] = ' style="background-image:url(\'' . esc_attr( $item[6] ) . '\')"';
+                                $img_info['img_class'] = ' svg';
                         } elseif ( 0 === strpos( $item[6], 'dashicons-' ) ) {
-                                $img = '<br />';
-                                $img_class = ' dashicons ' . sanitize_html_class( $item[6] );
+                                $img_info['img'] = '<br />';
+                                $img_info['img_class'] = ' dashicons ' . sanitize_html_class( $item[6] );
                         }
+                        
+                        $img_info = apply_filters('admin_img_class', $img_info, $item[6]);
+                        extract($img_info);
                 }
                 $arrow = '<div class="wp-menu-arrow"><div></div></div>';
 

src/wp-admin/menu.php

@@ -109 +109 @@
         $ptype_for_id = sanitize_html_class( $ptype );
 
         if ( is_string( $ptype_obj->menu_icon ) ) {
-                // Special handling for data:image/svg+xml and Dashicons.
-                if ( 0 === strpos( $ptype_obj->menu_icon, 'data:image/svg+xml;base64,' ) || 0 === strpos( $ptype_obj->menu_icon, 'dashicons-' ) ) {
-                        $menu_icon = $ptype_obj->menu_icon;
-                } else {
-                        $menu_icon = esc_url( $ptype_obj->menu_icon );
+                $menu_icon   = false;
+                $iconClasses = array('dashicons-');
+                $iconClasses = apply_filters('admin_icon_classes', $iconClasses);
+                
+                foreach ($iconClasses as $iconClass) {
+                        if ( 0 === strpos( $ptype_obj->menu_icon, $iconClass ) ) {
+                                $menu_icon = $ptype_obj->menu_icon;
+                        }
+                }
+                
+                if (! $menu_icon ) {
+                        if ( 0 === strpos( $ptype_obj->menu_icon, 'data:image/svg+xml;base64,' ) ) {
+                                $menu_icon = $ptype_obj->menu_icon;
+                        } else {
+                                $menu_icon = esc_url( $ptype_obj->menu_icon );
+                        }
                 }
                 $ptype_class = $ptype_for_id;
         } else {