Changeset 38467

Timestamp:

08/31/2016 06:41:07 AM (9 years ago)

Author:

wonderboymusic

Message:

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

See #37699.

Location:

trunk/src

Files:

• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/includes/class-wp-press-this.php (modified) (2 diffs)
• wp-admin/includes/media.php (modified) (2 diffs)
• wp-admin/includes/template.php (modified) (1 diff)
• wp-includes/class-wp-admin-bar.php (modified) (1 diff)
• wp-includes/general-template.php (modified) (2 diffs)
• wp-includes/link-template.php (modified) (1 diff)
• wp-includes/media-template.php (modified) (1 diff)
• wp-includes/vars.php (modified) (1 diff)

trunk/src/wp-admin/edit-form-advanced.php

@@ -31 +31 @@
  */
 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 ) ) {
 

trunk/src/wp-admin/includes/class-wp-press-this.php

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

trunk/src/wp-admin/includes/media.php

@@ -1784 +1784 @@
  * @global string $type
  * @global string $tab
- * @global bool   $is_IE
  * @global bool   $is_opera
  *
@@ -1790 +1789 @@
  */
 function media_upload_form( $errors = null ) {
-    global $type, $tab, $is_IE, $is_opera;
+    global $type, $tab, $is_opera;
 
     if ( ! _device_can_upload() ) {

trunk/src/wp-admin/includes/template.php

@@ -1946 +1946 @@
 }
 
-/**
- *
- * @global bool $is_IE
- */
 function _wp_admin_html_begin() {
-    global $is_IE;
-
     $admin_html_class = ( is_admin_bar_showing() ) ? 'wp-toolbar' : '';
 
-    if ( $is_IE )
+    if ( wp_is_IE() ) {
         @header('X-UA-Compatible: IE=edge');
+    }
 
 ?>

trunk/src/wp-includes/class-wp-admin-bar.php

@@ -392 +392 @@
 
     /**
-     *
-     * @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 ( $is_IE ) {
-            if ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) )
+        if ( wp_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';

trunk/src/wp-includes/general-template.php

@@ -2905 +2905 @@
  * @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_IE, $is_edge;
+    global $wp_rich_edit, $is_gecko, $is_opera, $is_safari, $is_chrome, $is_edge;
 
     if ( !isset($wp_rich_edit) ) {
@@ -2918 +2917 @@
             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 || $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;
             }

trunk/src/wp-includes/link-template.php

@@ -2897 +2897 @@
  *
  * @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 ( $is_IE ) {
+    if ( wp_is_IE() ) {
         /*
          * Return the old/shorter bookmarklet code for MSIE 8 and lower,

trunk/src/wp-includes/media-template.php

@@ -134 +134 @@
  *
  * @since 3.5.0
- *
- * @global bool $is_IE
  */
 function wp_print_media_templates() {
-    global $is_IE;
     $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';
+    }
     ?>
     <!--[if lte IE 8]>

trunk/src/wp-includes/vars.php

@@ -140 +140 @@
     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;
+}