Changeset 25289 for trunk/src/wp-includes/nav-menu.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/nav-menu.php (modified) (2 diffs)

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();