From a545afb331b8aa141c222062ec216753fbca4bbb Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremy.felt@gmail.com>
Date: Tue, 25 Oct 2016 23:44:30 +0000
Subject: [PATCH] Multisite: Deprecate the `blog_details` filter.

`get_site()` has replaced `get_blog_details()` throughout core and is the recommended way to retrieve a current or single site object.

The `blog_details` filter is applied when full details are requested from `get_blog_details()`.

To ensure backwards compatibility in the switch to `get_site()`, this `blog_details` filter is now applied in `WP_Site::get_details()` and marked as deprecated with a note to rely instead on the `site_details` filter introduced in 4.6.

Props flixos90.
See #37102.
Fixes #38491.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38879 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-site.php | 3 +++
 wp-includes/ms-blogs.php      | 3 ++-
 wp-includes/version.php       | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/wp-includes/class-wp-site.php b/wp-includes/class-wp-site.php
index 1e53f227ce..53529fe946 100644
--- a/wp-includes/class-wp-site.php
+++ b/wp-includes/class-wp-site.php
@@ -346,6 +346,9 @@ final class WP_Site {
 			}
 		}
 
+		/** This filter is documented in wp-includes/ms-blogs.php */
+		$details = apply_filters_deprecated( 'blog_details', array( $details ), '4.7.0', 'site_details' );
+
 		/**
 		 * Filters a site's extended properties.
 		 *
diff --git a/wp-includes/ms-blogs.php b/wp-includes/ms-blogs.php
index 46a3961c8f..4e2a255663 100644
--- a/wp-includes/ms-blogs.php
+++ b/wp-includes/ms-blogs.php
@@ -240,10 +240,11 @@ function get_blog_details( $fields = null, $get_all = true ) {
 	 * Filters a blog's details.
 	 *
 	 * @since MU
+	 * @deprecated 4.7.0 Use site_details
 	 *
 	 * @param object $details The blog details.
 	 */
-	$details = apply_filters( 'blog_details', $details );
+	$details = apply_filters_deprecated( 'blog_details', array( $details ), '4.7.0', 'site_details' );
 
 	wp_cache_set( $blog_id . $all, $details, 'blog-details' );
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4375e2f8eb..2aa7154017 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38935';
+$wp_version = '4.7-alpha-38936';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.