WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

General: use a new function, `wp_is_IE()`, instead of the `$is_IE` global in a number of places. 

See #37699.

Built from https://develop.svn.wordpress.org/trunk@38467


git-svn-id: http://core.svn.wordpress.org/trunk@38408 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2016-08-31 06:42:33 +00:00
parent 69e7fe3c5b
commit 021e23e70b
10 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/edit-form-advanced.php
View File

@ -30,7 +30,7 @@ $_wp_editor_expand = $_content_editor_dfw = false;
* @param string $post_type Post type. * @param string $post_type Post type.
*/ */
if ( post_type_supports( $post_type, 'editor' ) && ! wp_is_mobile() && if ( post_type_supports( $post_type, 'editor' ) && ! wp_is_mobile() &&
! ( $is_IE && preg_match( '/MSIE [5678]/', $_SERVER['HTTP_USER_AGENT'] ) ) && ! ( wp_is_IE() && preg_match( '/MSIE [5678]/', $_SERVER['HTTP_USER_AGENT'] ) ) &&
apply_filters( 'wp_editor_expand', true, $post_type ) ) { apply_filters( 'wp_editor_expand', true, $post_type ) ) {
wp_enqueue_script('editor-expand'); wp_enqueue_script('editor-expand');

3
wp-admin/includes/class-wp-press-this.php
View File

@ -1187,7 +1187,6 @@ class WP_Press_This {
* @access public * @access public
* *
* @global WP_Locale $wp_locale * @global WP_Locale $wp_locale
* @global bool $is_IE
*/ */
public function html() { public function html() {
global $wp_locale; global $wp_locale;
@ -1227,7 +1226,7 @@ class WP_Press_This {
add_filter( 'mce_css', array( $this, 'add_editor_style' ) ); add_filter( 'mce_css', array( $this, 'add_editor_style' ) );
if ( ! empty( $GLOBALS['is_IE'] ) ) { if ( wp_is_IE() ) {
@header( 'X-UA-Compatible: IE=edge' ); @header( 'X-UA-Compatible: IE=edge' );
} }

3
wp-admin/includes/media.php
View File

@ -1783,13 +1783,12 @@ function media_upload_header() {
* *
* @global string $type * @global string $type
* @global string $tab * @global string $tab
* @global bool $is_IE
* @global bool $is_opera * @global bool $is_opera
* *
* @param array $errors * @param array $errors
*/ */
function media_upload_form( $errors = null ) { function media_upload_form( $errors = null ) {
global $type, $tab, $is_IE, $is_opera; global $type, $tab, $is_opera;
if ( ! _device_can_upload() ) { if ( ! _device_can_upload() ) {
echo '<p>' . sprintf( __('The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.'), 'https://apps.wordpress.org/' ) . '</p>'; echo '<p>' . sprintf( __('The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.'), 'https://apps.wordpress.org/' ) . '</p>';

9
wp-admin/includes/template.php
View File

@ -1945,17 +1945,12 @@ function get_submit_button( $text = '', $type = 'primary large', $name = 'submit
return $button; return $button;
} }
/**
*
* @global bool $is_IE
*/
function _wp_admin_html_begin() { function _wp_admin_html_begin() {
global $is_IE;
$admin_html_class = ( is_admin_bar_showing() ) ? 'wp-toolbar' : ''; $admin_html_class = ( is_admin_bar_showing() ) ? 'wp-toolbar' : '';
if ( $is_IE ) if ( wp_is_IE() ) {
@header('X-UA-Compatible: IE=edge'); @header('X-UA-Compatible: IE=edge');
}
?> ?>
<!DOCTYPE html> <!DOCTYPE html>

13
wp-includes/class-wp-admin-bar.php
View File

@ -391,23 +391,20 @@ class WP_Admin_Bar {
} }
/** /**
*
* @global bool $is_IE
* @param object $root * @param object $root
*/ */
final protected function _render( $root ) { final protected function _render( $root ) {
global $is_IE;
// Add browser classes. // Add browser classes.
// We have to do this here since admin bar shows on the front end. // We have to do this here since admin bar shows on the front end.
$class = 'nojq nojs'; $class = 'nojq nojs';
if ( $is_IE ) { if ( wp_is_IE() ) {
if ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) ) if ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) ) {
$class .= ' ie7'; $class .= ' ie7';
elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 8' ) ) } elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 8' ) ) {
$class .= ' ie8'; $class .= ' ie8';
elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 9' ) ) } elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 9' ) ) {
$class .= ' ie9'; $class .= ' ie9';
}
} elseif ( wp_is_mobile() ) { } elseif ( wp_is_mobile() ) {
$class .= ' mobile'; $class .= ' mobile';
} }

5
wp-includes/general-template.php
View File

@ -2904,12 +2904,11 @@ function wp_dependencies_unique_hosts() {
* @global bool $is_opera * @global bool $is_opera
* @global bool $is_safari * @global bool $is_safari
* @global bool $is_chrome * @global bool $is_chrome
* @global bool $is_IE
* *
* @return bool * @return bool
*/ */
function user_can_richedit() { function user_can_richedit() {
global $wp_rich_edit, $is_gecko, $is_opera, $is_safari, $is_chrome, $is_IE, $is_edge; global $wp_rich_edit, $is_gecko, $is_opera, $is_safari, $is_chrome, $is_edge;
if ( !isset($wp_rich_edit) ) { if ( !isset($wp_rich_edit) ) {
$wp_rich_edit = false; $wp_rich_edit = false;
@ -2917,7 +2916,7 @@ function user_can_richedit() {
if ( get_user_option( 'rich_editing' ) == 'true' || ! is_user_logged_in() ) { // default to 'true' for logged out users if ( get_user_option( 'rich_editing' ) == 'true' || ! is_user_logged_in() ) { // default to 'true' for logged out users
if ( $is_safari ) { if ( $is_safari ) {
$wp_rich_edit = ! wp_is_mobile() || ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval( $match[1] ) >= 534 ); $wp_rich_edit = ! wp_is_mobile() || ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval( $match[1] ) >= 534 );
} elseif ( $is_gecko || $is_chrome || $is_IE || $is_edge || ( $is_opera && !wp_is_mobile() ) ) { } elseif ( $is_gecko || $is_chrome || wp_is_IE() || $is_edge || ( $is_opera && !wp_is_mobile() ) ) {
$wp_rich_edit = true; $wp_rich_edit = true;
} }
} }

6
wp-includes/link-template.php
View File

@ -2896,15 +2896,11 @@ function the_comments_pagination( $args = array() ) {
* Retrieves the Press This bookmarklet link. * Retrieves the Press This bookmarklet link.
* *
* @since 2.6.0 * @since 2.6.0
*
* @global bool $is_IE Whether the browser matches an Internet Explorer user agent.
*/ */
function get_shortcut_link() { function get_shortcut_link() {
global $is_IE;
$link = ''; $link = '';
if ( $is_IE ) { if ( wp_is_IE() ) {
/* /*
* Return the old/shorter bookmarklet code for MSIE 8 and lower, * Return the old/shorter bookmarklet code for MSIE 8 and lower,
* since they only support a max length of ~2000 characters for * since they only support a max length of ~2000 characters for

6
wp-includes/media-template.php
View File

@ -133,14 +133,12 @@ function wp_underscore_video_template() {
* Prints the templates used in the media manager. * Prints the templates used in the media manager.
* *
* @since 3.5.0 * @since 3.5.0
*
* @global bool $is_IE
*/ */
function wp_print_media_templates() { function wp_print_media_templates() {
global $is_IE;
$class = 'media-modal wp-core-ui'; $class = 'media-modal wp-core-ui';
if ( $is_IE && strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 7') !== false ) if ( wp_is_IE() && strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 7') !== false ) {
$class .= ' ie7'; $class .= ' ie7';
}
?> ?>
<!--[if lte IE 8]> <!--[if lte IE 8]>
<style> <style>

12
wp-includes/vars.php
View File

@ -139,3 +139,15 @@ function wp_is_mobile() {
return $is_mobile; return $is_mobile;
} }
/**
* @since 4.7.0
*
* @global bool $is_IE Whether the current user agent is Internet Explorer
*
* @return bool Return the value of the $is_IE global.
*/
function wp_is_IE() {
global $is_IE;
return $is_IE;
}

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7-alpha-38466'; $wp_version = '4.7-alpha-38467';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.