WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Multisite: Replace `get_blog_details()` with `get_site()` in `get_dashboard_blog()`. 

Props dipesh.kakadiya.
Fixes #38353.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38845 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Jeremy Felt 2016-10-25 05:05:33 +00:00
parent afe90360b5
commit 749b480de0
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/ms-deprecated.php
View File

@ -18,17 +18,18 @@
* Dashboard blog functionality was removed in WordPress 3.1, replaced by the user admin. * Dashboard blog functionality was removed in WordPress 3.1, replaced by the user admin.
* *
* @since MU * @since MU
* @deprecated 3.1.0 Use get_blog_details() * @deprecated 3.1.0 Use get_site()
* @see get_blog_details() * @see get_blog_details()
* *
* @return int Current site ID. * @return int Current site ID.
*/ */
function get_dashboard_blog() { function get_dashboard_blog() {
_deprecated_function( __FUNCTION__, '3.1.0' ); _deprecated_function( __FUNCTION__, '3.1.0' );
if ( $blog = get_site_option( 'dashboard_blog' ) ) if ( $blog = get_site_option( 'dashboard_blog' ) ) {
return get_blog_details( $blog ); return get_site( $blog );
}
return get_blog_details( get_network()->site_id ); return get_site( get_network()->site_id );
} }
/** /**

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7-alpha-38901'; $wp_version = '4.7-alpha-38902';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.