WordPress 4.5

[autoinstalls/wordpress.git] / wp-includes / vars.php

diff --git a/wp-includes/vars.php b/wp-includes/vars.php
index f1e67b627b70e04651f0da413730e9320421b0bc..c903101997a60c37b49606514f44332a8c062b67 100644 (file)
--- a/wp-includes/vars.php
+++ b/wp-includes/vars.php
@@ -6,14 +6,17 @@
  * for the browser to set which one is currently being used.
  *
  * Detects which user environment WordPress is being used on.
- * Only attempts to check for Apache and IIS. Two web servers
- * with known permalink capability.
+ * Only attempts to check for Apache, Nginx and IIS -- three web
+ * servers with known pretty permalink capability.
+ *
+ * Note: Though Nginx is detected, WordPress does not currently
+ * generate rewrite rules for it. See https://codex.wordpress.org/Nginx
  *
  * @package WordPress
  */
 
 global $pagenow,
-       $is_lynx, $is_gecko, $is_winIE, $is_macIE, $is_opera, $is_NS4, $is_safari, $is_chrome, $is_iphone, $is_IE,
+       $is_lynx, $is_gecko, $is_winIE, $is_macIE, $is_opera, $is_NS4, $is_safari, $is_chrome, $is_iphone, $is_IE, $is_edge,
        $is_apache, $is_IIS, $is_iis7, $is_nginx;
 
 // On which page are we ?
@@ -45,11 +48,13 @@ if ( is_admin() ) {
 unset($self_matches);
 
 // Simple browser detection
-$is_lynx = $is_gecko = $is_winIE = $is_macIE = $is_opera = $is_NS4 = $is_safari = $is_chrome = $is_iphone = false;
+$is_lynx = $is_gecko = $is_winIE = $is_macIE = $is_opera = $is_NS4 = $is_safari = $is_chrome = $is_iphone = $is_edge = false;
 
 if ( isset($_SERVER['HTTP_USER_AGENT']) ) {
        if ( strpos($_SERVER['HTTP_USER_AGENT'], 'Lynx') !== false ) {
                $is_lynx = true;
+       } elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Edge' ) !== false ) {
+               $is_edge = true;
        } elseif ( stripos($_SERVER['HTTP_USER_AGENT'], 'chrome') !== false ) {
                if ( stripos( $_SERVER['HTTP_USER_AGENT'], 'chromeframe' ) !== false ) {
                        $is_admin = is_admin();
@@ -115,14 +120,9 @@ $is_iis7 = $is_IIS && intval( substr( $_SERVER['SERVER_SOFTWARE'], strpos( $_SER
 /**
  * Test if the current browser runs on a mobile device (smart phone, tablet, etc.)
  *
- * @return bool true|false
+ * @return bool
  */
 function wp_is_mobile() {
-       static $is_mobile;
-
-       if ( isset($is_mobile) )
-               return $is_mobile;
-
        if ( empty($_SERVER['HTTP_USER_AGENT']) ) {
                $is_mobile = false;
        } elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Mobile') !== false // many mobile devices (all iPhone, iPad, etc.)