X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/96bc8e88cf39086a9e0a883b8e2c311fe82a5e97..849f15aeed7a5e39314057bdc0064d8edd60dd7d:/wp-admin/menu-header.php?ds=sidebyside
diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index cdd81b2a..dea73320 100644
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -19,7 +19,17 @@ $self = preg_replace('|^.*/plugins/|i', '', $self);
$self = preg_replace('|^.*/mu-plugins/|i', '', $self);
global $menu, $submenu, $parent_file; //For when admin-header is included from within a function.
-$parent_file = apply_filters("parent_file", $parent_file); // For plugins to move submenu tabs around.
+
+/**
+ * Filter the parent file of an admin menu sub-menu item.
+ *
+ * Allows plugins to move sub-menu items around.
+ *
+ * @since MU
+ *
+ * @param string $parent_file The parent file.
+ */
+$parent_file = apply_filters( 'parent_file', $parent_file );
get_admin_page_parent();
@@ -34,14 +44,16 @@ 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
+ // 0 = menu_title, 1 = capability, 2 = menu_slug, 3 = page_title, 4 = classes, 5 = hookname, 6 = icon_url
foreach ( $menu as $key => $item ) {
$admin_is_parent = false;
$class = array();
- $aria_attributes = 'tabindex="1"';
+ $aria_attributes = '';
+ $aria_hidden = '';
+ $is_separator = false;
if ( $first ) {
$class[] = 'wp-first-item';
@@ -59,24 +71,53 @@ 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] ) )
- $class[] = $item[4];
+ $class[] = esc_attr( $item[4] );
$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 = ' dashicons-before';
+
+ if ( false !== strpos( $class, 'wp-menu-separator' ) ) {
+ $is_separator = true;
+ }
+
+ /*
+ * 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-before ' . sanitize_html_class( $item[6] );
+ }
+ }
$arrow = '