Ticket #25147: 25147.menu_icon_data_image_v1.patch

wp-admin/menu-header.php

@@ -70 +70 @@
                 $img = '';
                 // if the string 'none' (previously 'div') is passed instead of an URL, don't output the default menu image
                 // so an icon can be added to div.wp-menu-image as background with CSS.
-                if ( ! empty( $item[6] ) )
-                        $img = ( 'none' === $item[6] || 'div' === $item[6] ) ? '<br />' : '<img src="' . $item[6] . '" alt="" />';
+                if ( ! empty( $item[6] ) ) {
+            $attr = preg_match( '/^data:image\b/m', $item[6] ) ? ' height="16px" width="16px"' : '';
+                        $img = ( 'none' === $item[6] || 'div' === $item[6] ) ? '<br />' : '<img src="' . $item[6] . '" alt=""' . $attr . ' />';
+        }
                 $arrow = '<div class="wp-menu-arrow"><div></div></div>';
 
                 $title = wptexturize( $item[0] );

wp-admin/menu.php

@@ -108 +108 @@
         $ptype_menu_position = is_int( $ptype_obj->menu_position ) ? $ptype_obj->menu_position : ++$_wp_last_object_menu; // If we're to use $_wp_last_object_menu, increment it first.
         $ptype_for_id = sanitize_html_class( $ptype );
         if ( is_string( $ptype_obj->menu_icon ) ) {
-                $menu_icon   = esc_url( $ptype_obj->menu_icon );
+                $menu_icon   = preg_match( '/data:image/', $ptype_obj->menu_icon ) ? $ptype_obj->menu_icon : esc_url( $ptype_obj->menu_icon );
                 $ptype_class = $ptype_for_id;
         } else {
                 $menu_icon   = 'none';