--- a/wp/wp-admin/admin-header.php Mon Jun 08 16:11:51 2015 +0000
+++ b/wp/wp-admin/admin-header.php Tue Jun 09 03:35:32 2015 +0200
@@ -12,7 +12,7 @@
// In case admin-header.php is included in a function.
global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow, $wp_version,
- $current_site, $update_title, $total_update_count, $parent_file;
+ $update_title, $total_update_count, $parent_file;
// Catch plugins that include admin-header.php before admin.php completes.
if ( empty( $current_screen ) )
@@ -22,9 +22,9 @@
$title = esc_html( strip_tags( $title ) );
if ( is_network_admin() )
- $admin_title = sprintf( __('Network Admin: %s'), esc_html( $current_site->site_name ) );
+ $admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_current_site()->site_name ) );
elseif ( is_user_admin() )
- $admin_title = sprintf( __('Global Dashboard: %s'), esc_html( $current_site->site_name ) );
+ $admin_title = sprintf( __( 'Global Dashboard: %s' ), esc_html( get_current_site()->site_name ) );
else
$admin_title = get_bloginfo( 'name' );
@@ -34,7 +34,7 @@
$admin_title = sprintf( __( '%1$s ‹ %2$s — WordPress' ), $title, $admin_title );
/**
- * Filter the <title> content for an admin page.
+ * Filter the title tag content for an admin page.
*
* @since 3.1.0
*
@@ -53,6 +53,7 @@
wp_enqueue_style( 'colors' );
wp_enqueue_style( 'ie' );
wp_enqueue_script('utils');
+wp_enqueue_script( 'svg-painter' );
$admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
?>
@@ -66,6 +67,7 @@
decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
isRtl = <?php echo (int) is_rtl(); ?>;
</script>
+<meta name="viewport" content="width=device-width,initial-scale=1.0">
<?php
/**
@@ -78,42 +80,45 @@
do_action( 'admin_enqueue_scripts', $hook_suffix );
/**
- * Print styles for a specific admin page based on $hook_suffix.
+ * Fires when styles are printed for a specific admin page based on $hook_suffix.
*
* @since 2.6.0
*/
do_action( "admin_print_styles-$hook_suffix" );
/**
- * Print styles for all admin pages.
+ * Fires when styles are printed for all admin pages.
*
* @since 2.6.0
*/
do_action( 'admin_print_styles' );
/**
- * Print scripts for a specific admin page based on $hook_suffix.
+ * Fires when scripts are printed for a specific admin page based on $hook_suffix.
*
* @since 2.1.0
*/
do_action( "admin_print_scripts-$hook_suffix" );
/**
- * Print scripts for all admin pages.
+ * Fires when scripts are printed for all admin pages.
*
* @since 2.1.0
*/
do_action( 'admin_print_scripts' );
/**
- * Fires in <head> for a specific admin page based on $hook_suffix.
+ * Fires in head section for a specific admin page.
+ *
+ * The dynamic portion of the hook, `$hook_suffix`, refers to the hook suffix
+ * for the admin page.
*
* @since 2.1.0
*/
do_action( "admin_head-$hook_suffix" );
/**
- * Fires in <head> for all admin pages.
+ * Fires in head section for all admin pages.
*
* @since 2.1.0
*/
@@ -145,36 +150,46 @@
if ( wp_is_mobile() )
$admin_body_class .= ' mobile';
-$admin_body_class .= ' no-customize-support';
+if ( is_multisite() )
+ $admin_body_class .= ' multisite';
+
+if ( is_network_admin() )
+ $admin_body_class .= ' network-admin';
+
+$admin_body_class .= ' no-customize-support no-svg';
?>
</head>
<?php
/**
- * Filter the admin <body> CSS classes.
+ * Filter the CSS classes for the body tag in the admin.
*
- * This filter differs from the post_class or body_class filters in two important ways:
- * 1. $classes is a space-separated string of class names instead of an array.
- * 2. Not all core admin classes are filterable, notably: wp-admin, wp-core-ui, and no-js cannot be removed.
+ * This filter differs from the {@see 'post_class'} and {@see 'body_class'} filters
+ * in two important ways:
+ *
+ * 1. `$classes` is a space-separated string of class names instead of an array.
+ * 2. Not all core admin classes are filterable, notably: wp-admin, wp-core-ui,
+ * and no-js cannot be removed.
*
* @since 2.3.0
*
- * @param string $classes Space-separated string of CSS classes.
+ * @param string $classes Space-separated list of CSS classes.
*/
+$admin_body_classes = apply_filters( 'admin_body_class', '' );
?>
-<body class="wp-admin wp-core-ui no-js <?php echo apply_filters( 'admin_body_class', '' ) . " $admin_body_class"; ?>">
+<body class="wp-admin wp-core-ui no-js <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
<script type="text/javascript">
document.body.className = document.body.className.replace('no-js','js');
</script>
<?php
// Make sure the customize body classes are correct as early as possible.
-if ( current_user_can( 'edit_theme_options' ) )
+if ( current_user_can( 'customize' ) ) {
wp_customize_support_script();
+}
?>
<div id="wpwrap">
-<a tabindex="1" href="#wpbody-content" class="screen-reader-shortcut"><?php _e('Skip to main content'); ?></a>
<?php require(ABSPATH . 'wp-admin/menu-header.php'); ?>
<div id="wpcontent">
@@ -187,7 +202,7 @@
do_action( 'in_admin_header' );
?>
-<div id="wpbody">
+<div id="wpbody" role="main">
<?php
unset($title_class, $blog_name, $total_update_count, $update_title);