Changeset 25289

Timestamp:

09/06/2013 06:09:24 PM (11 years ago)

Author:

wonderboymusic

Message:

Introduce wp_using_ext_object_cache() - mimic wp_suspend_cache_invalidation() and discourage direct access to $_wp_using_ext_object_cache, cleaning up importing of globals in functions and provides function to modify that global. Loads the packaged object cache when an external cache hasn't been loaded or doesn't contain wp_cache_init().

Fixes #21401.

Location:

trunk/src

Files:

• wp-cron.php (modified) (1 diff)
• wp-includes/load.php (modified) (4 diffs)
• wp-includes/nav-menu.php (modified) (2 diffs)
• wp-includes/option.php (modified) (7 diffs)
• wp-includes/query.php (modified) (2 diffs)

trunk/src/wp-cron.php

@@ -29 +29 @@
 // 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

trunk/src/wp-includes/load.php

@@ -371 +371 @@
 
 /**
+ * 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.
  *
@@ -380 +398 @@
  */
 function wp_start_object_cache() {
-    global $_wp_using_ext_object_cache, $blog_id;
+    global $blog_id;
 
     $first_init = false;
@@ -386 +404 @@
         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.
@@ -404 +424 @@
     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();
 

trunk/src/wp-includes/nav-menu.php

@@ -477 +477 @@
  */
 function wp_get_nav_menu_items( $menu, $args = array() ) {
-    global $_wp_using_ext_object_cache;
-
     $menu = wp_get_nav_menu_object( $menu );
 
@@ -505 +503 @@
 
     // 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();

trunk/src/wp-includes/option.php

@@ -166 +166 @@
  */
 function wp_load_core_site_options( $site_id = null ) {
-    global $wpdb, $_wp_using_ext_object_cache;
-
-    if ( !is_multisite() || $_wp_using_ext_object_cache || defined( 'WP_INSTALLING' ) )
+    global $wpdb;
+
+    if ( !is_multisite() || wp_using_ext_object_cache() || defined( 'WP_INSTALLING' ) )
         return;
 
@@ -405 +405 @@
  */
 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 {
@@ -444 +442 @@
  */
 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 {
@@ -494 +490 @@
  */
 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 {
@@ -971 +965 @@
  */
 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 {
@@ -1009 +1001 @@
  */
 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 {
@@ -1059 +1049 @@
  */
 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 {

trunk/src/wp-includes/query.php

@@ -1947 +1947 @@
      */
     function get_posts() {
-        global $wpdb, $user_ID, $_wp_using_ext_object_cache;
+        global $wpdb, $user_ID;
 
         $this->parse_query();
@@ -1997 +1997 @@
 
         if ( !isset($q['cache_results']) ) {
-            if ( $_wp_using_ext_object_cache )
+            if ( wp_using_ext_object_cache() )
                 $q['cache_results'] = false;
             else