Wordpress 3.7

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

diff --git a/wp-includes/load.php b/wp-includes/load.php
index e1eb15e4bb4f6434c49b9553747dce4b62be03db..e589f5fa5a3b6f740384dd2256ca525348f17fa9 100644 (file)
--- a/wp-includes/load.php
+++ b/wp-includes/load.php
@@ -369,6 +369,24 @@ 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
+ *
+ * @param bool $using Whether external object cache is being used
+ * @return bool The current 'using' setting
+ */
+function wp_using_ext_object_cache( $using = null ) {
+       global $_wp_using_ext_object_cache;
+       $current_using = $_wp_using_ext_object_cache;
+       if ( null !== $using )
+               $_wp_using_ext_object_cache = $using;
+       return $current_using;
+}
+

 /**
  * Starts the WordPress object cache.
  *
 /**
  * Starts the WordPress object cache.
  *


@@ -379,31 +397,33 @@ function wp_set_wpdb_vars() {
  * @since 3.0.0
  */
 function wp_start_object_cache() {
  * @since 3.0.0
  */
 function wp_start_object_cache() {

-       global $_wp_using_ext_object_cache, $blog_id;
+       global $blog_id;

 
        $first_init = false;
        if ( ! function_exists( 'wp_cache_init' ) ) {
                if ( file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
                        require_once ( WP_CONTENT_DIR . '/object-cache.php' );
 
        $first_init = false;
        if ( ! function_exists( 'wp_cache_init' ) ) {
                if ( file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
                        require_once ( WP_CONTENT_DIR . '/object-cache.php' );

-                       $_wp_using_ext_object_cache = true;
-               } else {
-                       require_once ( ABSPATH . WPINC . '/cache.php' );
-                       $_wp_using_ext_object_cache = false;
+                       if ( function_exists( 'wp_cache_init' ) )
+                               wp_using_ext_object_cache( true );

                }
                }

+

                $first_init = true;
                $first_init = true;

-       } else if ( !$_wp_using_ext_object_cache && file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
+       } else if ( ! 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 and can result in $_wp_using_ext_object_cache
                // being set incorrectly. Double check if an external cache exists.
                // Sometimes advanced-cache.php can load object-cache.php before it is loaded here.
                // This breaks the function_exists check above and can result in $_wp_using_ext_object_cache
                // being set incorrectly. Double check if an external cache exists.

-               $_wp_using_ext_object_cache = true;
+               wp_using_ext_object_cache( true );

        }
 
        }
 

+       if ( ! wp_using_ext_object_cache() )
+               require_once ( ABSPATH . WPINC . '/cache.php' );
+

        // If cache supports reset, reset instead of init if already initialized.
        // Reset signals to the cache that global IDs have changed and it may need to update keys
        // and cleanup caches.
        if ( ! $first_init && function_exists( 'wp_cache_switch_to_blog' ) )
                wp_cache_switch_to_blog( $blog_id );
        // If cache supports reset, reset instead of init if already initialized.
        // Reset signals to the cache that global IDs have changed and it may need to update keys
        // and cleanup caches.
        if ( ! $first_init && function_exists( 'wp_cache_switch_to_blog' ) )
                wp_cache_switch_to_blog( $blog_id );

-       else
+       elseif ( function_exists( 'wp_cache_init' ) )

                wp_cache_init();
 
        if ( function_exists( 'wp_cache_add_global_groups' ) ) {
                wp_cache_init();
 
        if ( function_exists( 'wp_cache_add_global_groups' ) ) {


@@ -425,12 +445,12 @@ function wp_not_installed() {
                if ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) )
                        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' ) ) {
                if ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) )
                        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' ) ) {

-
-               $link = wp_guess_url() . '/wp-admin/install.php';
-

                require( ABSPATH . WPINC . '/kses.php' );
                require( ABSPATH . WPINC . '/pluggable.php' );
                require( ABSPATH . WPINC . '/formatting.php' );
                require( ABSPATH . WPINC . '/kses.php' );
                require( ABSPATH . WPINC . '/pluggable.php' );
                require( ABSPATH . WPINC . '/formatting.php' );

+
+               $link = wp_guess_url() . '/wp-admin/install.php';
+

                wp_redirect( $link );
                die();
        }
                wp_redirect( $link );
                die();
        }


@@ -552,6 +572,11 @@ function wp_magic_quotes() {
  * @since 1.2.0
  */
 function shutdown_action_hook() {
  * @since 1.2.0
  */
 function shutdown_action_hook() {

+       /**
+        * Fires just before PHP shuts down execution.
+        *
+        * @since 1.2.0
+        */

        do_action( 'shutdown' );
        wp_cache_close();
 }
        do_action( 'shutdown' );
        wp_cache_close();
 }