Update WP and plugins

This commit is contained in:
Oliver Davies 2019-04-16 20:56:22 +01:00
parent 10a4713229
commit 1fb77fc4ff
864 changed files with 101724 additions and 78262 deletions

View file

@ -6,9 +6,10 @@
* @subpackage Administration
*/
@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
if ( ! defined( 'WP_ADMIN' ) )
@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
if ( ! defined( 'WP_ADMIN' ) ) {
require_once( dirname( __FILE__ ) . '/admin.php' );
}
/**
* In case admin-header.php is included in a function.
@ -26,25 +27,26 @@ global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow,
$update_title, $total_update_count, $parent_file;
// Catch plugins that include admin-header.php before admin.php completes.
if ( empty( $current_screen ) )
if ( empty( $current_screen ) ) {
set_current_screen();
}
get_admin_page_title();
$title = esc_html( strip_tags( $title ) );
if ( is_network_admin() ) {
/* translators: Network admin screen title. 1: Network name */
/* translators: Network admin screen title. %s: Network name */
$admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_network()->site_name ) );
} elseif ( is_user_admin() ) {
/* translators: User dashboard screen title. 1: Network name */
/* translators: User dashboard screen title. %s: Network name */
$admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_network()->site_name ) );
} else {
$admin_title = get_bloginfo( 'name' );
}
if ( $admin_title == $title ) {
/* translators: Admin screen title. 1: Admin screen name */
$admin_title = sprintf( __( '%1$s — WordPress' ), $title );
/* translators: Admin screen title. %s: Admin screen name */
$admin_title = sprintf( __( '%s — WordPress' ), $title );
} else {
/* translators: Admin screen title. 1: Admin screen name, 2: Network or site name */
$admin_title = sprintf( __( '%1$s ‹ %2$s — WordPress' ), $title, $admin_title );
@ -69,10 +71,10 @@ _wp_admin_html_begin();
wp_enqueue_style( 'colors' );
wp_enqueue_style( 'ie' );
wp_enqueue_script('utils');
wp_enqueue_script( 'utils' );
wp_enqueue_script( 'svg-painter' );
$admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
$admin_body_class = preg_replace( '/[^a-z0-9_-]+/i', '-', $hook_suffix );
?>
<script type="text/javascript">
addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
@ -141,37 +143,46 @@ do_action( "admin_head-{$hook_suffix}" );
*/
do_action( 'admin_head' );
if ( get_user_setting('mfold') == 'f' )
if ( get_user_setting( 'mfold' ) == 'f' ) {
$admin_body_class .= ' folded';
}
if ( !get_user_setting('unfold') )
if ( ! get_user_setting( 'unfold' ) ) {
$admin_body_class .= ' auto-fold';
}
if ( is_admin_bar_showing() )
if ( is_admin_bar_showing() ) {
$admin_body_class .= ' admin-bar';
}
if ( is_rtl() )
if ( is_rtl() ) {
$admin_body_class .= ' rtl';
}
if ( $current_screen->post_type )
if ( $current_screen->post_type ) {
$admin_body_class .= ' post-type-' . $current_screen->post_type;
}
if ( $current_screen->taxonomy )
if ( $current_screen->taxonomy ) {
$admin_body_class .= ' taxonomy-' . $current_screen->taxonomy;
}
$admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( get_bloginfo( 'version' ) ) );
$admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', get_bloginfo( 'version' ) ) );
$admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );
if ( wp_is_mobile() )
if ( wp_is_mobile() ) {
$admin_body_class .= ' mobile';
}
if ( is_multisite() )
if ( is_multisite() ) {
$admin_body_class .= ' multisite';
}
if ( is_network_admin() )
if ( is_network_admin() ) {
$admin_body_class .= ' network-admin';
}
$admin_body_class .= ' no-customize-support no-svg';
@ -202,8 +213,9 @@ if ( $current_screen->is_block_editor() ) {
* @param string $classes Space-separated list of CSS classes.
*/
$admin_body_classes = apply_filters( 'admin_body_class', '' );
$admin_body_classes = ltrim( $admin_body_classes . ' ' . $admin_body_class );
?>
<body class="wp-admin wp-core-ui no-js <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
<body class="wp-admin wp-core-ui no-js <?php echo $admin_body_classes; ?>">
<script type="text/javascript">
document.body.className = document.body.className.replace('no-js','js');
</script>
@ -216,7 +228,7 @@ if ( current_user_can( 'customize' ) ) {
?>
<div id="wpwrap">
<?php require(ABSPATH . 'wp-admin/menu-header.php'); ?>
<?php require( ABSPATH . 'wp-admin/menu-header.php' ); ?>
<div id="wpcontent">
<?php
@ -230,13 +242,13 @@ do_action( 'in_admin_header' );
<div id="wpbody" role="main">
<?php
unset($title_class, $blog_name, $total_update_count, $update_title);
unset( $blog_name, $total_update_count, $update_title );
$current_screen->set_parentage( $parent_file );
?>
<div id="wpbody-content" aria-label="<?php esc_attr_e('Main content'); ?>" tabindex="0">
<div id="wpbody-content">
<?php
$current_screen->render_screen_meta();
@ -271,5 +283,6 @@ if ( is_network_admin() ) {
*/
do_action( 'all_admin_notices' );
if ( $parent_file == 'options-general.php' )
require(ABSPATH . 'wp-admin/options-head.php');
if ( $parent_file == 'options-general.php' ) {
require( ABSPATH . 'wp-admin/options-head.php' );
}