X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/fef8173b8c3bad08f495551e43cfdeac1cae6021..refs/tags/wordpress-3.3.1-scripts:/wp-admin/admin-header.php diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php index ac793409..a34a51b8 100644 --- a/wp-admin/admin-header.php +++ b/wp-admin/admin-header.php @@ -10,6 +10,14 @@ if ( ! defined( 'WP_ADMIN' ) ) require_once( './admin.php' ); +// In case admin-header.php is included in a function. +global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow, $wp_version, $is_iphone, + $current_site, $update_title, $total_update_count, $parent_file; + +// Catch plugins that include admin-header.php before admin.php completes. +if ( empty( $current_screen ) ) + set_current_screen(); + get_admin_page_title(); $title = esc_html( strip_tags( $title ) ); @@ -28,28 +36,19 @@ else $admin_title = apply_filters( 'admin_title', $admin_title, $title ); wp_user_settings(); -wp_menu_unfold(); +_wp_admin_html_begin(); ?> - - > -
-%2$s'), 'profile.php', $user_identity); -if ( is_multisite() && is_super_admin() ) { - if ( !is_network_admin() ) - $links[10] = '| ' . __('Network Admin') . ( ! empty( $total_update_count ) ? ' (' . number_format_i18n( $total_update_count ) . ')' : '' ) . ''; - else - $links[10] = '| ' . __('Site Admin') . ''; -} -$links[15] = '| ' . __('Log Out') . ''; - -$links = apply_filters('admin_user_info_links', $links, $current_user); -ksort($links); - -echo implode(' ', $links); -?>
-