diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index 0a6b50d6ad..75c3cef2f2 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -30,7 +30,7 @@ $_wp_editor_expand = $_content_editor_dfw = false; * @param string $post_type Post type. */ if ( post_type_supports( $post_type, 'editor' ) && ! wp_is_mobile() && - ! ( wp_is_IE() && preg_match( '/MSIE [5678]/', $_SERVER['HTTP_USER_AGENT'] ) ) && + ! ( $is_IE && preg_match( '/MSIE [5678]/', $_SERVER['HTTP_USER_AGENT'] ) ) && apply_filters( 'wp_editor_expand', true, $post_type ) ) { wp_enqueue_script('editor-expand'); diff --git a/wp-admin/includes/class-wp-press-this.php b/wp-admin/includes/class-wp-press-this.php index c8e78a23d1..3ff242bed8 100644 --- a/wp-admin/includes/class-wp-press-this.php +++ b/wp-admin/includes/class-wp-press-this.php @@ -1187,6 +1187,7 @@ class WP_Press_This { * @access public * * @global WP_Locale $wp_locale + * @global bool $is_IE */ public function html() { global $wp_locale; @@ -1226,7 +1227,7 @@ class WP_Press_This { add_filter( 'mce_css', array( $this, 'add_editor_style' ) ); - if ( wp_is_IE() ) { + if ( ! empty( $GLOBALS['is_IE'] ) ) { @header( 'X-UA-Compatible: IE=edge' ); } diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index 140d03a0ec..63807f71de 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -1783,12 +1783,13 @@ function media_upload_header() { * * @global string $type * @global string $tab + * @global bool $is_IE * @global bool $is_opera * * @param array $errors */ function media_upload_form( $errors = null ) { - global $type, $tab, $is_opera; + global $type, $tab, $is_IE, $is_opera; if ( ! _device_can_upload() ) { echo '

' . sprintf( __('The web browser on your device cannot be used to upload files. You may be able to use the native app for your device instead.'), 'https://apps.wordpress.org/' ) . '

'; diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index 18284a0799..dce84fc43a 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -1945,12 +1945,17 @@ function get_submit_button( $text = '', $type = 'primary large', $name = 'submit return $button; } +/** + * + * @global bool $is_IE + */ function _wp_admin_html_begin() { + global $is_IE; + $admin_html_class = ( is_admin_bar_showing() ) ? 'wp-toolbar' : ''; - if ( wp_is_IE() ) { + if ( $is_IE ) @header('X-UA-Compatible: IE=edge'); - } ?> diff --git a/wp-includes/class-wp-admin-bar.php b/wp-includes/class-wp-admin-bar.php index 4b42527b06..49986ac225 100644 --- a/wp-includes/class-wp-admin-bar.php +++ b/wp-includes/class-wp-admin-bar.php @@ -391,20 +391,23 @@ class WP_Admin_Bar { } /** + * + * @global bool $is_IE * @param object $root */ final protected function _render( $root ) { + global $is_IE; + // Add browser classes. // We have to do this here since admin bar shows on the front end. $class = 'nojq nojs'; - if ( wp_is_IE() ) { - if ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) ) { + if ( $is_IE ) { + if ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) ) $class .= ' ie7'; - } elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 8' ) ) { + elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 8' ) ) $class .= ' ie8'; - } elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 9' ) ) { + elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 9' ) ) $class .= ' ie9'; - } } elseif ( wp_is_mobile() ) { $class .= ' mobile'; } diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index 9cacf229f4..7a056412d5 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -2904,11 +2904,12 @@ function wp_dependencies_unique_hosts() { * @global bool $is_opera * @global bool $is_safari * @global bool $is_chrome + * @global bool $is_IE * * @return bool */ function user_can_richedit() { - global $wp_rich_edit, $is_gecko, $is_opera, $is_safari, $is_chrome, $is_edge; + global $wp_rich_edit, $is_gecko, $is_opera, $is_safari, $is_chrome, $is_IE, $is_edge; if ( !isset($wp_rich_edit) ) { $wp_rich_edit = false; @@ -2916,7 +2917,7 @@ function user_can_richedit() { if ( get_user_option( 'rich_editing' ) == 'true' || ! is_user_logged_in() ) { // default to 'true' for logged out users if ( $is_safari ) { $wp_rich_edit = ! wp_is_mobile() || ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval( $match[1] ) >= 534 ); - } elseif ( $is_gecko || $is_chrome || wp_is_IE() || $is_edge || ( $is_opera && !wp_is_mobile() ) ) { + } elseif ( $is_gecko || $is_chrome || $is_IE || $is_edge || ( $is_opera && !wp_is_mobile() ) ) { $wp_rich_edit = true; } } diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php index b218d78ff8..0460a3284d 100644 --- a/wp-includes/link-template.php +++ b/wp-includes/link-template.php @@ -2896,11 +2896,15 @@ function the_comments_pagination( $args = array() ) { * Retrieves the Press This bookmarklet link. * * @since 2.6.0 + * + * @global bool $is_IE Whether the browser matches an Internet Explorer user agent. */ function get_shortcut_link() { + global $is_IE; + $link = ''; - if ( wp_is_IE() ) { + if ( $is_IE ) { /* * Return the old/shorter bookmarklet code for MSIE 8 and lower, * since they only support a max length of ~2000 characters for diff --git a/wp-includes/media-template.php b/wp-includes/media-template.php index 22d1e4feb1..c6699216e9 100644 --- a/wp-includes/media-template.php +++ b/wp-includes/media-template.php @@ -133,12 +133,14 @@ function wp_underscore_video_template() { * Prints the templates used in the media manager. * * @since 3.5.0 + * + * @global bool $is_IE */ function wp_print_media_templates() { + global $is_IE; $class = 'media-modal wp-core-ui'; - if ( wp_is_IE() && strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 7') !== false ) { + if ( $is_IE && strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 7') !== false ) $class .= ' ie7'; - } ?>