Ticket #21401: 21401.diff

wp-cron.php

@@ -28 +28 @@
 
 // Uncached doing_cron transient fetch
 function _get_cron_lock() {
-        global $_wp_using_ext_object_cache, $wpdb;
+        global $wpdb;
 
         $value = 0;
-        if ( $_wp_using_ext_object_cache ) {
+        if ( wp_using_ext_object_cache() ) {
                 // Skip local cache and force refetch of doing_cron transient in case
                 // another processs updated the cache
                 $value = wp_cache_get( 'doing_cron', 'transient', true );

wp-includes/load.php

@@ -370 +370 @@
 }
 
 /**
+ * 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.
  *
  * If an object-cache.php file exists in the wp-content directory,
@@ -379 +397 @@
  * @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' );
-                        $_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;
-        } 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.
-                $_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 );
-        else
+        elseif ( function_exists( 'wp_cache_init' ) )
                 wp_cache_init();
 
         if ( function_exists( 'wp_cache_add_global_groups' ) ) {

wp-includes/nav-menu.php

@@ -476 +476 @@
  * @return mixed $items array of menu items, else false.
  */
 function wp_get_nav_menu_items( $menu, $args = array() ) {
-        global $_wp_using_ext_object_cache;
-
         $menu = wp_get_nav_menu_object( $menu );
 
         if ( ! $menu )
@@ -504 +502 @@
                 return false;
 
         // Get all posts and terms at once to prime the caches
-        if ( empty( $fetched[$menu->term_id] ) || $_wp_using_ext_object_cache ) {
+        if ( empty( $fetched[$menu->term_id] ) || wp_using_ext_object_cache() ) {
                 $fetched[$menu->term_id] = true;
                 $posts = array();
                 $terms = array();

wp-includes/option.php

@@ -165 +165 @@
  * @param int $site_id Optional site ID for which to query the options. Defaults to the current site.
  */
 function wp_load_core_site_options( $site_id = null ) {
-        global $wpdb, $_wp_using_ext_object_cache;
+        global $wpdb;
 
-        if ( !is_multisite() || $_wp_using_ext_object_cache || defined( 'WP_INSTALLING' ) )
+        if ( !is_multisite() || wp_using_ext_object_cache() || defined( 'WP_INSTALLING' ) )
                 return;
 
         if ( empty($site_id) )
@@ -404 +404 @@
  * @return bool true if successful, false otherwise
  */
 function delete_transient( $transient ) {
-        global $_wp_using_ext_object_cache;
-
         do_action( 'delete_transient_' . $transient, $transient );
 
-        if ( $_wp_using_ext_object_cache ) {
+        if ( wp_using_ext_object_cache() ) {
                 $result = wp_cache_delete( $transient, 'transient' );
         } else {
                 $option_timeout = '_transient_timeout_' . $transient;
@@ -443 +441 @@
  * @return mixed Value of transient
  */
 function get_transient( $transient ) {
-        global $_wp_using_ext_object_cache;
-
         $pre = apply_filters( 'pre_transient_' . $transient, false );
         if ( false !== $pre )
                 return $pre;
 
-        if ( $_wp_using_ext_object_cache ) {
+        if ( wp_using_ext_object_cache() ) {
                 $value = wp_cache_get( $transient, 'transient' );
         } else {
                 $transient_option = '_transient_' . $transient;
@@ -492 +488 @@
  * @return bool False if value was not set and true if value was set.
  */
 function set_transient( $transient, $value, $expiration = 0 ) {
-        global $_wp_using_ext_object_cache;
-
         $value = apply_filters( 'pre_set_transient_' . $transient, $value );
 
-        if ( $_wp_using_ext_object_cache ) {
+        if ( wp_using_ext_object_cache() ) {
                 $result = wp_cache_set( $transient, $value, 'transient', $expiration );
         } else {
                 $transient_timeout = '_transient_timeout_' . $transient;
@@ -945 +939 @@
  * @return bool True if successful, false otherwise
  */
 function delete_site_transient( $transient ) {
-        global $_wp_using_ext_object_cache;
-
         do_action( 'delete_site_transient_' . $transient, $transient );
-        if ( $_wp_using_ext_object_cache ) {
+        if ( wp_using_ext_object_cache() ) {
                 $result = wp_cache_delete( $transient, 'site-transient' );
         } else {
                 $option_timeout = '_site_transient_timeout_' . $transient;
@@ -983 +975 @@
  * @return mixed Value of transient
  */
 function get_site_transient( $transient ) {
-        global $_wp_using_ext_object_cache;
-
         $pre = apply_filters( 'pre_site_transient_' . $transient, false );
         if ( false !== $pre )
                 return $pre;
 
-        if ( $_wp_using_ext_object_cache ) {
+        if ( wp_using_ext_object_cache() ) {
                 $value = wp_cache_get( $transient, 'site-transient' );
         } else {
                 // Core transients that do not have a timeout. Listed here so querying timeouts can be avoided.
@@ -1032 +1022 @@
  * @return bool False if value was not set and true if value was set.
  */
 function set_site_transient( $transient, $value, $expiration = 0 ) {
-        global $_wp_using_ext_object_cache;
-
         $value = apply_filters( 'pre_set_site_transient_' . $transient, $value );
 
-        if ( $_wp_using_ext_object_cache ) {
+        if ( wp_using_ext_object_cache() ) {
                 $result = wp_cache_set( $transient, $value, 'site-transient', $expiration );
         } else {
                 $transient_timeout = '_site_transient_timeout_' . $transient;

wp-includes/query.php

@@ -1917 +1917 @@
          * @return array List of posts.
          */
         function get_posts() {
-                global $wpdb, $user_ID, $_wp_using_ext_object_cache;
+                global $wpdb, $user_ID;
 
                 $this->parse_query();
 
@@ -1967 +1967 @@
                         $q['suppress_filters'] = false;
 
                 if ( !isset($q['cache_results']) ) {
-                        if ( $_wp_using_ext_object_cache )
+                        if ( wp_using_ext_object_cache() )
                                 $q['cache_results'] = false;
                         else
                                 $q['cache_results'] = true;

wp-settings.php

@@ -54 +54 @@
 wp_debug_mode();
 
 // For an advanced caching plugin to use. Uses a static drop-in because you would only want one.
-if ( WP_CACHE )
+if ( WP_CACHE && file_exists( WP_CONTENT_DIR . '/advanced-cache.php' ) )
         WP_DEBUG ? include( WP_CONTENT_DIR . '/advanced-cache.php' ) : @include( WP_CONTENT_DIR . '/advanced-cache.php' );
 
 // Define WP_LANG_DIR if not set.