X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/256a3b381f63716209b3527d0a14442ae570c283..9e77185fafaf4e60e2b73821e0e4b9b1a11fb85f:/wp-admin/menu-header.php?ds=sidebyside
diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index 6b775f4c..275cc145 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();
@@ -37,7 +47,7 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
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();
@@ -63,15 +73,19 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = 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 = $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.
+ $img = $img_style = '';
+ $img_class = ' dashicons-before';
+
+ /*
+ * 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 = '';
@@ -83,7 +97,7 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
$img_class = ' svg';
} elseif ( 0 === strpos( $item[6], 'dashicons-' ) ) {
$img = '
';
- $img_class = ' dashicons ' . sanitize_html_class( $item[6] );
+ $img_class = ' dashicons-before ' . sanitize_html_class( $item[6] );
}
}
$arrow = '