X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/5aa86a9053fb0fa15846bb60aac2fb8fdfff524a..e08b42e8ad054ec67522d7ac1aaae5dc68cb3d01:/wp-admin/menu-header.php?ds=sidebyside
diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index cdd81b2a..6b775f4c 100644
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -34,14 +34,14 @@ get_admin_page_parent();
* @param bool $submenu_as_parent
*/
function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
- global $self, $parent_file, $submenu_file, $plugin_page, $pagenow, $typenow;
+ global $self, $parent_file, $submenu_file, $plugin_page, $typenow;
$first = true;
// 0 = name, 1 = capability, 2 = file, 3 = class, 4 = id, 5 = icon src
foreach ( $menu as $key => $item ) {
$admin_is_parent = false;
$class = array();
- $aria_attributes = 'tabindex="1"';
+ $aria_attributes = '';
if ( $first ) {
$class[] = 'wp-first-item';
@@ -59,7 +59,7 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
} else {
$class[] = 'wp-not-current-submenu';
if ( ! empty( $submenu_items ) )
- $aria_attributes .= ' aria-haspopup="true"';
+ $aria_attributes .= 'aria-haspopup="true"';
}
if ( ! empty( $item[4] ) )
@@ -67,9 +67,25 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
$class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
$id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
- $img = '';
- if ( ! empty( $item[6] ) )
- $img = ( 'div' === $item[6] ) ? '
' : '';
+ $img = $img_style = $img_class = '';
+
+ // 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.
+ // Dashicons and base64-encoded data:image/svg_xml URIs are also handled as special cases.
+ if ( ! empty( $item[6] ) ) {
+ $img = '';
+
+ if ( 'none' === $item[6] || 'div' === $item[6] ) {
+ $img = '
';
+ } elseif ( 0 === strpos( $item[6], 'data:image/svg+xml;base64,' ) ) {
+ $img = '
';
+ $img_style = ' style="background-image:url(\'' . esc_attr( $item[6] ) . '\')"';
+ $img_class = ' svg';
+ } elseif ( 0 === strpos( $item[6], 'dashicons-' ) ) {
+ $img = '
';
+ $img_class = ' dashicons ' . sanitize_html_class( $item[6] );
+ }
+ }
$arrow = '