WordPress 4.3

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

diff --git a/wp-includes/load.php b/wp-includes/load.php
index c578c8de73e3353af4d9b0fbb3d5a9afe55e9bcd..a6ad0222a29be9a2411e795cf8b2ebecd76b3820 100644 (file)
--- a/wp-includes/load.php
+++ b/wp-includes/load.php
@@ -12,8 +12,6 @@
  *
  * @since 2.1.0
  * @access private
  *
  * @since 2.1.0
  * @access private

- *
- * @return null Will return null if register_globals PHP directive was disabled.

  */
 function wp_unregister_GLOBALS() {
        if ( !ini_get( 'register_globals' ) )
  */
 function wp_unregister_GLOBALS() {
        if ( !ini_get( 'register_globals' ) )


@@ -52,14 +50,14 @@ function wp_fix_server_vars() {
        $_SERVER = array_merge( $default_server_values, $_SERVER );
 
        // Fix for IIS when running with PHP ISAPI
        $_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
 
                // 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
                        $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL'];
                } else {
                        // Use ORIG_PATH_INFO if there is no PATH_INFO


@@ -217,13 +215,13 @@ function timer_start() {
  *
  * @since 0.71
  *
  *
  * @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.
  */
  * @return string The "second.microsecond" finished time calculation. The number is formatted
  *                for human consumption, both localized and rounded.
  */


@@ -386,13 +384,13 @@ function wp_set_wpdb_vars() {
 }
 
 /**
 }
 
 /**

- * Access/Modify private global variable `$_wp_using_ext_object_cache`.
- *

  * Toggle `$_wp_using_ext_object_cache` on and off without directly
  * touching global.
  *
  * @since 3.7.0
  *
  * Toggle `$_wp_using_ext_object_cache` on and off without directly
  * touching global.
  *
  * @since 3.7.0
  *

+ * @global bool $_wp_using_ext_object_cache
+ *

  * @param bool $using Whether external object cache is being used.
  * @return bool The current 'using' setting.
  */
  * @param bool $using Whether external object cache is being used.
  * @return bool The current 'using' setting.
  */


@@ -427,7 +425,7 @@ function wp_start_object_cache() {
                }
 
                $first_init = true;
                }
 
                $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
                /*
                 * Sometimes advanced-cache.php can load object-cache.php before
                 * it is loaded here. This breaks the function_exists check above


@@ -451,7 +449,7 @@ function wp_start_object_cache() {
                wp_cache_init();
 
        if ( function_exists( 'wp_cache_add_global_groups' ) ) {
                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' ) );
        }
 }
                wp_cache_add_non_persistent_groups( array( 'comment', 'counts', 'plugins' ) );
        }
 }


@@ -637,6 +635,8 @@ function wp_clone( $object ) {
  *
  * @since 1.5.1
  *
  *
  * @since 1.5.1
  *

+ * @global WP_Screen $current_screen
+ *

  * @return bool True if inside WordPress administration interface, false otherwise.
  */
 function is_admin() {
  * @return bool True if inside WordPress administration interface, false otherwise.
  */
 function is_admin() {


@@ -658,6 +658,8 @@ function is_admin() {
  *
  * @since 3.1.0
  *
  *
  * @since 3.1.0
  *

+ * @global WP_Screen $current_screen
+ *

  * @return bool True if inside WordPress blog administration pages.
  */
 function is_blog_admin() {
  * @return bool True if inside WordPress blog administration pages.
  */
 function is_blog_admin() {


@@ -679,6 +681,8 @@ function is_blog_admin() {
  *
  * @since 3.1.0
  *
  *
  * @since 3.1.0
  *

+ * @global WP_Screen $current_screen
+ *

  * @return bool True if inside WordPress network administration pages.
  */
 function is_network_admin() {
  * @return bool True if inside WordPress network administration pages.
  */
 function is_network_admin() {


@@ -701,6 +705,8 @@ function is_network_admin() {
  *
  * @since 3.1.0
  *
  *
  * @since 3.1.0
  *

+ * @global WP_Screen $current_screen
+ *

  * @return bool True if inside WordPress user administration pages.
  */
 function is_user_admin() {
  * @return bool True if inside WordPress user administration pages.
  */
 function is_user_admin() {


@@ -734,6 +740,8 @@ function is_multisite() {
  *
  * @since 3.1.0
  *
  *
  * @since 3.1.0
  *

+ * @global int $blog_id
+ *

  * @return int Blog id
  */
 function get_current_blog_id() {
  * @return int Blog id
  */
 function get_current_blog_id() {


@@ -754,7 +762,10 @@ function get_current_blog_id() {
  * @since 3.4.0
  * @access private
  *
  * @since 3.4.0
  * @access private
  *

- * @global $wp_locale The WordPress date and time locale object.
+ * @global string    $text_direction
+ * @global WP_Locale $wp_locale      The WordPress date and time locale object.
+ *
+ * @staticvar bool $loaded

  */
 function wp_load_translations_early() {
        global $text_direction, $wp_locale;
  */
 function wp_load_translations_early() {
        global $text_direction, $wp_locale;