Changeset 25289 for trunk/src/wp-includes/option.php

Timestamp:

09/06/2013 06:09:24 PM (12 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.

File:

• trunk/src/wp-includes/option.php (modified) (7 diffs)

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 {