From bdf608745086893f44b0abed7b44b233e35bacbb Mon Sep 17 00:00:00 2001
From: Dion Hulse <wordpress@dd32.id.au>
Date: Mon, 12 Dec 2016 01:29:42 +0000
Subject: [PATCH] Bootstrap: Re-initialize any hooks added manually by
 `object-cache.php`. Prior to 3.1 if a object cache dropin wanted to add
 actions, they needed to use `$wp_filter` directly.

Props jorbin.
Fixes #39132.

Built from https://develop.svn.wordpress.org/trunk@39565


git-svn-id: http://core.svn.wordpress.org/trunk@39505 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/load.php    | 7 +++++++
 wp-includes/version.php | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/wp-includes/load.php b/wp-includes/load.php
index 669cf65d0b..68ed0bd1ee 100644
--- 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;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 0506979ce9..2745fa3548 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.8-alpha-39564';
+$wp_version = '4.8-alpha-39565';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.