Wordpress 3.6

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

diff --git a/wp-includes/vars.php b/wp-includes/vars.php
index aca78f1f63ba33d00d1bee0cbdcf8c03dad040ad..f55cdbd9fdf5f155ee1bda078997cf133e342ed5 100644 (file)
--- a/wp-includes/vars.php
+++ b/wp-includes/vars.php
@@ -12,15 +12,19 @@
  * @package WordPress
  */
 
  * @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_apache, $is_IIS, $is_iis7;
+

 // On which page are we ?
 if ( is_admin() ) {
        // wp-admin pages are checked more carefully
        if ( is_network_admin() )
 // On which page are we ?
 if ( is_admin() ) {
        // wp-admin pages are checked more carefully
        if ( is_network_admin() )

-               preg_match('#/wp-admin/network/?(.*?)$#i', $PHP_SELF, $self_matches);
+               preg_match('#/wp-admin/network/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);

        elseif ( is_user_admin() )
        elseif ( is_user_admin() )

-               preg_match('#/wp-admin/user/?(.*?)$#i', $PHP_SELF, $self_matches);
+               preg_match('#/wp-admin/user/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);

        else
        else

-               preg_match('#/wp-admin/?(.*?)$#i', $PHP_SELF, $self_matches);
+               preg_match('#/wp-admin/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);

        $pagenow = $self_matches[1];
        $pagenow = trim($pagenow, '/');
        $pagenow = preg_replace('#\?.*?$#', '', $pagenow);
        $pagenow = $self_matches[1];
        $pagenow = trim($pagenow, '/');
        $pagenow = preg_replace('#\?.*?$#', '', $pagenow);


@@ -33,7 +37,7 @@ if ( is_admin() ) {
                        $pagenow .= '.php'; // for Options +Multiviews: /wp-admin/themes/index.php (themes.php is queried)
        }
 } else {
                        $pagenow .= '.php'; // for Options +Multiviews: /wp-admin/themes/index.php (themes.php is queried)
        }
 } else {

-       if ( preg_match('#([^/]+\.php)([?/].*?)?$#i', $PHP_SELF, $self_matches) )
+       if ( preg_match('#([^/]+\.php)([?/].*?)?$#i', $_SERVER['PHP_SELF'], $self_matches) )

                $pagenow = strtolower($self_matches[1]);
        else
                $pagenow = 'index.php';
                $pagenow = strtolower($self_matches[1]);
        else
                $pagenow = 'index.php';


@@ -89,9 +93,35 @@ $is_apache = (strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false || strpos(
 $is_IIS = !$is_apache && (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false || strpos($_SERVER['SERVER_SOFTWARE'], 'ExpressionDevServer') !== false);
 
 /**
 $is_IIS = !$is_apache && (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false || strpos($_SERVER['SERVER_SOFTWARE'], 'ExpressionDevServer') !== false);
 
 /**

- * Whether the server software is IIS 7.X
+ * Whether the server software is IIS 7.X or greater

  * @global bool $is_iis7
  */
  * @global bool $is_iis7
  */

-$is_iis7 = $is_IIS && (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/7.') !== false);
+$is_iis7 = $is_IIS && intval( substr( $_SERVER['SERVER_SOFTWARE'], strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/' ) + 14 ) ) >= 7;
+
+/**
+ * Test if the current browser runs on a mobile device (smart phone, tablet, etc.)
+ *
+ * @return bool true|false
+ */
+function wp_is_mobile() {
+       static $is_mobile;

 
 

-?>
\ No newline at end of file
+       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.)
+               || strpos($_SERVER['HTTP_USER_AGENT'], 'Android') !== false
+               || strpos($_SERVER['HTTP_USER_AGENT'], 'Silk/') !== false
+               || strpos($_SERVER['HTTP_USER_AGENT'], 'Kindle') !== false
+               || strpos($_SERVER['HTTP_USER_AGENT'], 'BlackBerry') !== false
+               || strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mini') !== false
+               || strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mobi') !== false ) {
+                       $is_mobile = true;
+       } else {
+               $is_mobile = false;
+       }
+
+       return $is_mobile;
+}