Ticket #18966: 18966.2.diff

File 18966.2.diff, 6.6 KB (added by scribu, 19 months ago)

  • wp-admin/admin-header.php 

    diff --git wp-admin/admin-header.php wp-admin/admin-header.php
index fae0b8e..2c14a92 100644
    $admin_title = apply_filters( 'admin_title', $admin_title, $title ); 
    3333 
    3434wp_user_settings(); 
    3535 
     36_wp_admin_html_begin(); 
    3637?> 
    37 <!DOCTYPE html> 
    38 <html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); echo "$wp_htmltag_class "; language_attributes(); ?>> 
    39 <head> 
    40 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" /> 
    4138<title><?php echo $admin_title; ?></title> 
    4239<?php 
    4340 

  • wp-admin/includes/media.php 

    diff --git wp-admin/includes/media.php wp-admin/includes/media.php
index 2b433e4..c338d56 100644
    function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = 
    309309 * @param unknown_type $content_func 
    310310 */ 
    311311function wp_iframe($content_func /* ... */) { 
     312        _wp_admin_html_begin(); 
    312313?> 
    313 <!DOCTYPE html> 
    314 <html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); echo $GLOBALS['wp_htmltag_class'] . ' '; language_attributes(); ?>> 
    315 <head> 
    316 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" /> 
    317314<title><?php bloginfo('name') ?> &rsaquo; <?php _e('Uploads'); ?> &#8212; <?php _e('WordPress'); ?></title> 
    318315<?php 
    319316 

  • wp-admin/includes/template.php 

    diff --git wp-admin/includes/template.php wp-admin/includes/template.php
index eb2b6e2..b01322e 100644
    function iframe_header( $title = '', $limit_styles = false ) { 
    13521352        global $hook_suffix, $current_screen, $current_user, $admin_body_class, $wp_locale; 
    13531353        $admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix); 
    13541354 
    1355 ?><!DOCTYPE html> 
    1356 <html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); echo $GLOBALS['wp_htmltag_class'] . ' '; language_attributes(); ?>> 
    1357 <head> 
    1358 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" /> 
     1355        _wp_admin_html_begin(); 
     1356?> 
    13591357<title><?php bloginfo('name') ?> &rsaquo; <?php echo $title ?> &#8212; <?php _e('WordPress'); ?></title> 
    13601358<?php 
    13611359wp_enqueue_style( 'colors' ); 
    … … function get_submit_button( $text = NULL, $type = 'primary', $name = 'submit', $ 
    16291627        return $button; 
    16301628} 
    16311629 
     1630function _wp_admin_html_begin() { 
     1631        $class = ''; 
     1632        if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 8.' ) ) 
     1633                $class = ' class="ie8"'; 
     1634 
     1635        if ( is_network_admin() || is_user_admin() ) 
     1636                $content_type_string = 'text/html; charset=utf-8'; 
     1637        else 
     1638                $content_type_string =  get_bloginfo('html_type') . '; charset=' . get_option( 'blog_charset' ); 
     1639 
     1640?> 
     1641<!DOCTYPE html> 
     1642<html xmlns="http://www.w3.org/1999/xhtml" <?php 
     1643        do_action('admin_xml_ns'); 
     1644        echo $class . ' '; 
     1645        language_attributes(); 
     1646?>> 
     1647<head> 
     1648<meta http-equiv="Content-Type" content="<?php echo $content_type_string; ?>" /> 
     1649<?php 
     1650} 
     1651 
    16321652/** 
    16331653 * Initializes the new feature pointers. 
    16341654 * 

  • wp-admin/network/sites.php 

    diff --git wp-admin/network/sites.php wp-admin/network/sites.php
index 52778d8..5e07fb0 100644
    if ( isset( $_GET['action'] ) ) { 
    202202                        } 
    203203                        if ( $current_site->blog_id == $id ) 
    204204                                wp_die( __( 'You are not allowed to change the current site.' ) ); 
    205                         ?> 
    206                         <!DOCTYPE html> 
    207                         <html xmlns="http://www.w3.org/1999/xhtml" <?php if ( function_exists( 'language_attributes' ) ) language_attributes(); ?>> 
    208                                 <head> 
    209                                         <title><?php _e( 'WordPress &rsaquo; Confirm your action' ); ?></title> 
    210  
    211                                         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
    212                                         <?php 
    213                                         wp_admin_css( 'install', true ); 
    214                                         wp_admin_css( 'ie', true ); 
    215                                         ?> 
     205 
     206                        _wp_admin_html_begin(); 
     207?> 
     208                        <title><?php _e( 'WordPress &rsaquo; Confirm your action' ); ?></title> 
     209<?php 
     210                        wp_admin_css( 'install', true ); 
     211                        wp_admin_css( 'ie', true ); 
     212?> 
    216213                                </head> 
    217214                                <body> 
    218215                                        <h1 id="logo"><img alt="WordPress" src="<?php echo esc_attr( admin_url( 'images/wordpress-logo.png' ) ); ?>" /></h1> 

  • wp-admin/press-this.php 

    diff --git wp-admin/press-this.php wp-admin/press-this.php
index 8329c24..e2cf3ca 100644
    define('IFRAME_REQUEST' , true); 
    1111/** WordPress Administration Bootstrap */ 
    1212require_once('./admin.php'); 
    1313 
    14 header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); 
     14header('Content-Type: ' . get_bloginfo('html_type') . '; charset=' . get_option('blog_charset')); 
    1515 
    1616if ( ! current_user_can('edit_posts') ) 
    1717        wp_die( __( 'Cheatin&#8217; uh?' ) ); 
    … … if ( !empty($_REQUEST['ajax']) ) { 
    280280die; 
    281281} 
    282282 
     283_wp_admin_html_begin(); 
    283284?> 
    284 <!DOCTYPE html> 
    285 <html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); echo "$wp_htmltag_class "; language_attributes(); ?>> 
    286 <head> 
    287         <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" /> 
    288         <title><?php _e('Press This') ?></title> 
    289  
     285<title><?php _e('Press This') ?></title> 
    290286<?php 
    291287        wp_enqueue_style( 'colors' ); 
    292288        wp_enqueue_script( 'post' ); 

  • wp-admin/upgrade.php 

    diff --git wp-admin/upgrade.php wp-admin/upgrade.php
index 84e251b..148db29 100644
    $mysql_version = $wpdb->db_version(); 
    4040$php_compat     = version_compare( $php_version, $required_php_version, '>=' ); 
    4141$mysql_compat   = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' ); 
    4242 
    43 @header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) ); 
     43header( 'Content-Type: ' . get_bloginfo( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) ); 
     44_wp_admin_html_begin(); 
    4445?> 
    45 <!DOCTYPE html> 
    46 <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>> 
    47 <head> 
    48         <meta http-equiv="Content-Type" content="<?php bloginfo( 'html_type' ); ?>; charset=<?php echo get_option( 'blog_charset' ); ?>" /> 
    4946        <title><?php _e( 'WordPress &rsaquo; Update' ); ?></title> 
    5047        <?php 
    5148        wp_admin_css( 'install', true ); 

  • wp-includes/vars.php 

    diff --git wp-includes/vars.php wp-includes/vars.php
index a2b4c31..fb526b5 100644
    if ( $is_safari && stripos($_SERVER['HTTP_USER_AGENT'], 'mobile') !== false ) 
    7474 
    7575$is_IE = ( $is_macIE || $is_winIE ); 
    7676 
    77 $wp_htmltag_class = strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 8.') ? ' class="ie8"' : ''; // can't start with this 
    78  
    7977// Server detection 
    8078 
    8179/**