Wordpress 3.0.4

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

diff --git a/wp-includes/vars.php b/wp-includes/vars.php
index 77e9ca3e7658e9cf91cc25be5a262d59665fb330..7a62c892ad0553e05a6509eecf4c30a06ae72a1a 100644 (file)
--- a/wp-includes/vars.php
+++ b/wp-includes/vars.php
@@ -17,6 +17,7 @@ if ( is_admin() ) {
        // wp-admin pages are checked more carefully
        preg_match('#/wp-admin/?(.*?)$#i', $PHP_SELF, $self_matches);
        $pagenow = $self_matches[1];
+       $pagenow = trim($pagenow, '/');
        $pagenow = preg_replace('#\?.*?$#', '', $pagenow);
        if ( '' === $pagenow || 'index' === $pagenow || 'index.php' === $pagenow ) {
                $pagenow = 'index.php';
@@ -34,22 +35,31 @@ if ( is_admin() ) {
 }
 
 // Simple browser detection
-$is_lynx = $is_gecko = $is_winIE = $is_macIE = $is_opera = $is_NS4 = false;
+$is_lynx = $is_gecko = $is_winIE = $is_macIE = $is_opera = $is_NS4 = $is_safari = $is_chrome = $is_iphone = false;
 
-if (strpos($_SERVER['HTTP_USER_AGENT'], 'Lynx') !== false) {
-       $is_lynx = true;
-} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false) {
-       $is_gecko = true;
-} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Win') !== false) {
-       $is_winIE = true;
-} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mac') !== false) {
-       $is_macIE = true;
-} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false) {
-       $is_opera = true;
-} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Nav') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mozilla/4.') !== false) {
-       $is_NS4 = true;
+if ( isset($_SERVER['HTTP_USER_AGENT']) ) {
+       if ( strpos($_SERVER['HTTP_USER_AGENT'], 'Lynx') !== false ) {
+               $is_lynx = true;
+       } elseif ( stripos($_SERVER['HTTP_USER_AGENT'], 'chrome') !== false ) {
+               $is_chrome = true;
+       } elseif ( stripos($_SERVER['HTTP_USER_AGENT'], 'safari') !== false ) {
+               $is_safari = true;
+       } elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false ) {
+               $is_gecko = true;
+       } elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Win') !== false ) {
+               $is_winIE = true;
+       } elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mac') !== false ) {
+               $is_macIE = true;
+       } elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false ) {
+               $is_opera = true;
+       } elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Nav') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mozilla/4.') !== false ) {
+               $is_NS4 = true;
+       }
 }
 
+if ( $is_safari && stripos($_SERVER['HTTP_USER_AGENT'], 'mobile') !== false )
+       $is_iphone = true;
+
 $is_IE = ( $is_macIE || $is_winIE );
 
 // Server detection
@@ -58,12 +68,19 @@ $is_IE = ( $is_macIE || $is_winIE );
  * Whether the server software is Apache or something else
  * @global bool $is_apache
  */
-$is_apache = ((strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false) || (strpos($_SERVER['SERVER_SOFTWARE'], 'LiteSpeed') !== false)) ? true : false;
+$is_apache = (strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false || strpos($_SERVER['SERVER_SOFTWARE'], 'LiteSpeed') !== false);
 
 /**
  * Whether the server software is IIS or something else
  * @global bool $is_IIS
  */
-$is_IIS = (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false) ? true : false;
+$is_IIS = (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false || strpos($_SERVER['SERVER_SOFTWARE'], 'ExpressionDevServer') !== false);
+
+/**
+ * Whether the server software is IIS 7.X
+ * @global bool $is_iis7
+ */
+$is_iis7 = (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/7.') !== false);
+
 
 ?>
\ No newline at end of file