WordPress 3.8

[autoinstalls/wordpress.git] / wp-admin / menu-header.php

diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index 10ad1395ecf8f6704c34cabe267edb7302c6492b..6b775f4c08bf2f727185bf4a0477c6510b02814c 100644 (file)
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -67,11 +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 = '';
+               $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.
-               if ( ! empty( $item[6] ) )
-                       $img = ( 'none' === $item[6] || 'div' === $item[6] ) ? '<br />' : '<img src="' . $item[6] . '" alt="" />';
+               // 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="" />';
+
+                       if ( 'none' === $item[6] || 'div' === $item[6] ) {
+                               $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';
+                       } elseif ( 0 === strpos( $item[6], 'dashicons-' ) ) {
+                               $img = '<br />';
+                               $img_class = ' dashicons ' . sanitize_html_class( $item[6] );
+                       }
+               }
                $arrow = '<div class="wp-menu-arrow"><div></div></div>';
 
                $title = wptexturize( $item[0] );
@@ -88,9 +102,9 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
                                $menu_file = substr( $menu_file, 0, $pos );
                        if ( ! empty( $menu_hook ) || ( ( 'index.php' != $submenu_items[0][2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
                                $admin_is_parent = true;
-                               echo "<a href='admin.php?page={$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image'>$img</div><div class='wp-menu-name'>$title</div></a>";
+                               echo "<a href='admin.php?page={$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>$title</div></a>";
                        } else {
-                               echo "\n\t<a href='{$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image'>$img</div><div class='wp-menu-name'>$title</div></a>";
+                               echo "\n\t<a href='{$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>$title</div></a>";
                        }
                } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
                        $menu_hook = get_plugin_page_hook( $item[2], 'admin.php' );
@@ -99,9 +113,9 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
                                $menu_file = substr( $menu_file, 0, $pos );
                        if ( ! empty( $menu_hook ) || ( ( 'index.php' != $item[2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
                                $admin_is_parent = true;
-                               echo "\n\t<a href='admin.php?page={$item[2]}'$class $aria_attributes>$arrow<div class='wp-menu-image'>$img</div><div class='wp-menu-name'>{$item[0]}</div></a>";
+                               echo "\n\t<a href='admin.php?page={$item[2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>{$item[0]}</div></a>";
                        } else {
-                               echo "\n\t<a href='{$item[2]}'$class $aria_attributes>$arrow<div class='wp-menu-image'>$img</div><div class='wp-menu-name'>{$item[0]}</div></a>";
+                               echo "\n\t<a href='{$item[2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>{$item[0]}</div></a>";
                        }
                }
 
@@ -176,7 +190,6 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 
 <div id="adminmenuback"></div>
 <div id="adminmenuwrap">
-<div id="adminmenushadow"></div>
 <ul id="adminmenu" role="navigation">
 
 <?php