WordPress 4.7.1

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

diff --git a/wp-includes/load.php b/wp-includes/load.php
index 669cf65d0b93d24dbe7959359afaaf76bcd4a503..68ed0bd1eefada6e9d7499b1235baea701b4ece3 100644 (file)
--- a/wp-includes/load.php
+++ b/wp-includes/load.php
@@ -472,6 +472,8 @@ function wp_using_ext_object_cache( $using = null ) {
  * @access private
  */
 function wp_start_object_cache() {
+       global $wp_filter;
+
        $first_init = false;
        if ( ! function_exists( 'wp_cache_init' ) ) {
                if ( file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
@@ -479,6 +481,11 @@ function wp_start_object_cache() {
                        if ( function_exists( 'wp_cache_init' ) ) {
                                wp_using_ext_object_cache( true );
                        }
+
+                       // Re-initialize any hooks added manually by object-cache.php
+                       if ( $wp_filter ) {
+                               $wp_filter = WP_Hook::build_preinitialized_hooks( $wp_filter );
+                       }
                }
 
                $first_init = true;