WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

_wp_menu_output() speed up and clean up. Props dragoonis. Fixes #13662. 

Attempt file_exists() last and cache an array index lookup for speed up. Whitespace and appropriate parentheses for readability.


git-svn-id: http://svn.automattic.com/wordpress/trunk@18792 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
duck_ 2011-09-27 10:22:58 +00:00
parent 6edb31db27
commit 2b11174785
1 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
wp-admin/menu-header.php
View File

@ -44,20 +44,21 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
foreach ( $menu as $key => $item ) { foreach ( $menu as $key => $item ) {
$admin_is_parent = false; $admin_is_parent = false;
$class = array(); $class = array();
if ( $first ) { if ( $first ) {
$class[] = 'wp-first-item'; $class[] = 'wp-first-item';
$first = false; $first = false;
} }
$submenu_items = false;
if ( ! empty( $submenu[$item[2]] ) ) { if ( ! empty( $submenu[$item[2]] ) ) {
$class[] = 'wp-has-submenu'; $class[] = 'wp-has-submenu';
$submenu_items = $submenu[$item[2]];
$menu_setting_increment++; $menu_setting_increment++;
} }
if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($typenow) && $self == $item[2] ) ) { if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($typenow) && $self == $item[2] ) ) {
if ( !empty($submenu[$item[2]]) ) $class[] = ! empty( $submenu_items ) ? 'wp-has-current-submenu wp-menu-open' : 'current';
$class[] = 'wp-has-current-submenu wp-menu-open';
else
$class[] = 'current';
} else { } else {
$class[] = 'wp-not-current-submenu'; $class[] = 'wp-not-current-submenu';
} }
@ -69,12 +70,8 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
$tabindex = ' tabindex="1"'; $tabindex = ' tabindex="1"';
$id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : ''; $id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
$img = ''; $img = '';
if ( ! empty($item[6]) ) { if ( ! empty( $item[6] ) )
if ( 'div' === $item[6] ) $img = ( 'div' === $item[6] ) ? '<br />' : '<img src="' . $item[6] . '" alt="" />';
$img = '<br />';
else
$img = '<img src="' . $item[6] . '" alt="" />';
}
$arrow = '<div class="wp-menu-arrow"><div></div></div>'; $arrow = '<div class="wp-menu-arrow"><div></div></div>';
$title = wptexturize( $item[0] ); $title = wptexturize( $item[0] );
@ -83,24 +80,24 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
if ( false !== strpos( $class, 'wp-menu-separator' ) ) { if ( false !== strpos( $class, 'wp-menu-separator' ) ) {
echo '<div class="separator"></div>'; echo '<div class="separator"></div>';
} elseif ( $submenu_as_parent && !empty($submenu[$item[2]]) ) { } elseif ( $submenu_as_parent && ! empty( $submenu_items ) ) {
$submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index. $submenu_items = array_values( $submenu_items ); // Re-index.
$menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]); $menu_hook = get_plugin_page_hook( $submenu_items[0][2], $item[2] );
$menu_file = $submenu[$item[2]][0][2]; $menu_file = $submenu_items[0][2];
if ( false !== $pos = strpos($menu_file, '?') ) if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
$menu_file = substr( $menu_file, 0, $pos ); $menu_file = substr( $menu_file, 0, $pos );
if ( ( ('index.php' != $submenu[$item[2]][0][2]) && file_exists(WP_PLUGIN_DIR . "/$menu_file") ) || !empty($menu_hook)) { if ( ! empty( $menu_hook ) || ( ('index.php' != $submenu_items[0][2]) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) ) ) {
$admin_is_parent = true; $admin_is_parent = true;
echo "<div class='wp-menu-image'><a href='admin.php?page={$submenu[$item[2]][0][2]}'>$img</a></div>$arrow<a href='admin.php?page={$submenu[$item[2]][0][2]}'$class$tabindex>$title</a>"; echo "<div class='wp-menu-image'><a href='admin.php?page={$submenu_items[0][2]}'>$img</a></div>$arrow<a href='admin.php?page={$submenu_items[0][2]}'$class$tabindex>$title</a>";
} else { } else {
echo "\n\t<div class='wp-menu-image'><a href='{$submenu[$item[2]][0][2]}'>$img</a></div>$arrow<a href='{$submenu[$item[2]][0][2]}'$class$tabindex>$title</a>"; echo "\n\t<div class='wp-menu-image'><a href='{$submenu_items[0][2]}'>$img</a></div>$arrow<a href='{$submenu_items[0][2]}'$class$tabindex>$title</a>";
} }
} elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) { } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
$menu_hook = get_plugin_page_hook( $item[2], 'admin.php' ); $menu_hook = get_plugin_page_hook( $item[2], 'admin.php' );
$menu_file = $item[2]; $menu_file = $item[2];
if ( false !== $pos = strpos($menu_file, '?') ) if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
$menu_file = substr( $menu_file, 0, $pos ); $menu_file = substr( $menu_file, 0, $pos );
if ( ('index.php' != $item[2]) && file_exists(WP_PLUGIN_DIR . "/$menu_file") || !empty($menu_hook) ) { if ( ! empty( $menu_hook ) || ( ('index.php' != $item[2]) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) ) ) {
$admin_is_parent = true; $admin_is_parent = true;
echo "\n\t<div class='wp-menu-image'><a href='admin.php?page={$item[2]}'>$img</a></div>$arrow<a href='admin.php?page={$item[2]}'$class$tabindex>{$item[0]}</a>"; echo "\n\t<div class='wp-menu-image'><a href='admin.php?page={$item[2]}'>$img</a></div>$arrow<a href='admin.php?page={$item[2]}'$class$tabindex>{$item[0]}</a>";
} else { } else {
@ -108,11 +105,11 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
} }
} }
if ( !empty($submenu[$item[2]]) ) { if ( ! empty( $submenu_items ) ) {
echo "\n\t<div class='wp-submenu'><div class='wp-submenu-wrap'>"; echo "\n\t<div class='wp-submenu'><div class='wp-submenu-wrap'>";
echo "<div class='wp-submenu-head'>{$item[0]}</div><ul>"; echo "<div class='wp-submenu-head'>{$item[0]}</div><ul>";
$first = true; $first = true;
foreach ( $submenu[$item[2]] as $sub_key => $sub_item ) { foreach ( $submenu_items as $sub_key => $sub_item ) {
if ( ! current_user_can( $sub_item[1] ) ) if ( ! current_user_can( $sub_item[1] ) )
continue; continue;
@ -124,21 +121,20 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
$menu_file = $item[2]; $menu_file = $item[2];
if ( false !== $pos = strpos($menu_file, '?') ) if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
$menu_file = substr( $menu_file, 0, $pos ); $menu_file = substr( $menu_file, 0, $pos );
// Handle current for post_type=post|page|foo pages, which won't match $self. // Handle current for post_type=post|page|foo pages, which won't match $self.
if ( !empty($typenow) ) $self_type = ! empty( $typenow ) ? $self . '?post_type=' . $typenow : 'nothing';
$self_type = $self . '?post_type=' . $typenow;
else
$self_type = 'nothing';
if ( isset($submenu_file) ) { if ( isset( $submenu_file ) && $submenu_file == $sub_item[2] ) {
if ( $submenu_file == $sub_item[2] )
$class[] = 'current'; $class[] = 'current';
// If plugin_page is set the parent must either match the current page or not physically exist. // If plugin_page is set the parent must either match the current page or not physically exist.
// This allows plugin pages with the same hook to exist under different parents. // This allows plugin pages with the same hook to exist under different parents.
} else if ( (isset($plugin_page) && $plugin_page == $sub_item[2] && (!file_exists($menu_file) || ($item[2] == $self) || ($item[2] == $self_type))) || (!isset($plugin_page) && $self == $sub_item[2]) ) { } else if (
( ! isset( $plugin_page ) && $self == $sub_item[2] ) ||
( isset( $plugin_page ) && $plugin_page == $sub_item[2] && ( $item[2] == $self_type || $item[2] == $self || file_exists($menu_file) === false ) )
) {
$class[] = 'current'; $class[] = 'current';
} }
@ -146,17 +142,18 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
$menu_hook = get_plugin_page_hook($sub_item[2], $item[2]); $menu_hook = get_plugin_page_hook($sub_item[2], $item[2]);
$sub_file = $sub_item[2]; $sub_file = $sub_item[2];
if ( false !== $pos = strpos($sub_file, '?') ) if ( false !== ( $pos = strpos( $sub_file, '?' ) ) )
$sub_file = substr($sub_file, 0, $pos); $sub_file = substr($sub_file, 0, $pos);
$title = wptexturize($sub_item[0]); $title = wptexturize($sub_item[0]);
if ( ( ('index.php' != $sub_item[2]) && file_exists(WP_PLUGIN_DIR . "/$sub_file") ) || ! empty($menu_hook) ) { if ( ! empty( $menu_hook ) || ( ('index.php' != $sub_item[2]) && file_exists( WP_PLUGIN_DIR . "/$sub_file" ) ) ) {
// If admin.php is the current page or if the parent exists as a file in the plugins or admin dir // If admin.php is the current page or if the parent exists as a file in the plugins or admin dir
if ( (!$admin_is_parent && file_exists(WP_PLUGIN_DIR . "/$menu_file") && !is_dir(WP_PLUGIN_DIR . "/{$item[2]}")) || file_exists($menu_file) ) if ( (!$admin_is_parent && file_exists(WP_PLUGIN_DIR . "/$menu_file") && !is_dir(WP_PLUGIN_DIR . "/{$item[2]}")) || file_exists($menu_file) )
$sub_item_url = add_query_arg( array('page' => $sub_item[2]), $item[2] ); $sub_item_url = add_query_arg( array('page' => $sub_item[2]), $item[2] );
else else
$sub_item_url = add_query_arg( array('page' => $sub_item[2]), 'admin.php' ); $sub_item_url = add_query_arg( array('page' => $sub_item[2]), 'admin.php' );
$sub_item_url = esc_url( $sub_item_url ); $sub_item_url = esc_url( $sub_item_url );
echo "<li$class><a href='$sub_item_url'$class$tabindex>$title</a></li>"; echo "<li$class><a href='$sub_item_url'$class$tabindex>$title</a></li>";
} else { } else {