From 7eece8b1060ca524faaa85870023aee9442e4b65 Mon Sep 17 00:00:00 2001 From: Jeremy Felt Date: Wed, 19 Oct 2016 05:50:28 +0000 Subject: [PATCH] Multisite: Replace `get_blog_details()` usage in `wpmu_delete_blog()` with `get_site()`. Props spacedmonkey, iamfriendly. See #37102. Fixes #38346. Built from https://develop.svn.wordpress.org/trunk@38821 git-svn-id: http://core.svn.wordpress.org/trunk@38764 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/ms.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php index 7f1e51b55b..acdd09fb3c 100644 --- a/wp-admin/includes/ms.php +++ b/wp-admin/includes/ms.php @@ -66,7 +66,7 @@ function wpmu_delete_blog( $blog_id, $drop = false ) { switch_to_blog( $blog_id ); } - $blog = get_blog_details( $blog_id ); + $blog = get_site( $blog_id ); /** * Fires before a site is deleted. * diff --git a/wp-includes/version.php b/wp-includes/version.php index 5dd1875b42..86e26d8ce9 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-alpha-38820'; +$wp_version = '4.7-alpha-38821'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.