WordPress 4.2.4-scripts

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

diff --git a/wp-includes/load.php b/wp-includes/load.php
index 07f2283ab9a8ac5eb7959da5a1af4038125dbb81..b41e650b6bd169bd16bba25bf4fcda6d6b277dc2 100644 (file)
--- a/wp-includes/load.php
+++ b/wp-includes/load.php
@@ -52,14 +52,14 @@ function wp_fix_server_vars() {
        $_SERVER = array_merge( $default_server_values, $_SERVER );
 
        // Fix for IIS when running with PHP ISAPI
-       if ( empty( $_SERVER['REQUEST_URI'] ) || ( php_sapi_name() != 'cgi-fcgi' && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) {
+       if ( empty( $_SERVER['REQUEST_URI'] ) || ( PHP_SAPI != 'cgi-fcgi' && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) {
 
                // IIS Mod-Rewrite
                if ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ) {
                        $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_ORIGINAL_URL'];
                }
                // IIS Isapi_Rewrite
-               else if ( isset( $_SERVER['HTTP_X_REWRITE_URL'] ) ) {
+               elseif ( isset( $_SERVER['HTTP_X_REWRITE_URL'] ) ) {
                        $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL'];
                } else {
                        // Use ORIG_PATH_INFO if there is no PATH_INFO
@@ -217,13 +217,13 @@ function timer_start() {
  *
  * @since 0.71
  *
- * @global float $timestart Seconds from when timer_start() is called.
- * @global float $timeend   Seconds from when function is called.
+ * @global float   $timestart Seconds from when timer_start() is called.
+ * @global float   $timeend   Seconds from when function is called.
  *
- * @param int $display   Whether to echo or return the results. Accepts 0|false for return,
- *                       1|true for echo. Default 0|false.
- * @param int $precision The number of digits from the right of the decimal to display.
- *                       Default 3.
+ * @param int|bool $display   Whether to echo or return the results. Accepts 0|false for return,
+ *                            1|true for echo. Default 0|false.
+ * @param int      $precision The number of digits from the right of the decimal to display.
+ *                            Default 3.
  * @return string The "second.microsecond" finished time calculation. The number is formatted
  *                for human consumption, both localized and rounded.
  */
@@ -427,7 +427,7 @@ function wp_start_object_cache() {
                }
 
                $first_init = true;
-       } else if ( ! wp_using_ext_object_cache() && file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
+       } elseif ( ! wp_using_ext_object_cache() && file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
                /*
                 * Sometimes advanced-cache.php can load object-cache.php before
                 * it is loaded here. This breaks the function_exists check above
@@ -451,7 +451,7 @@ function wp_start_object_cache() {
                wp_cache_init();
 
        if ( function_exists( 'wp_cache_add_global_groups' ) ) {
-               wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache' ) );
+               wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss', 'global-posts', 'blog-id-cache' ) );
                wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );
        }
 }
@@ -471,7 +471,7 @@ function wp_not_installed() {
 
                        wp_die( __( 'The site you have requested is not installed properly. Please contact the system administrator.' ) );
                }
-       } elseif ( ! is_blog_installed() && false === strpos( $_SERVER['PHP_SELF'], 'install.php' ) && !defined( 'WP_INSTALLING' ) ) {
+       } elseif ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) ) {
                nocache_headers();
 
                require( ABSPATH . WPINC . '/kses.php' );