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

Networks and Sites: Clarify the docblock for `get_current_site()` so it's clear that it returns the current network object, not anything to do with the current site. As a further exercise, the reader is invited to fix the nomenclature surrounding blogs, sites, and networks in WordPress. 

Props ericlewis
Fixes #35414

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


git-svn-id: http://core.svn.wordpress.org/trunk@36260 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2016-01-14 00:02:25 +00:00
parent d6228b95b0
commit 55bbcf0391
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/ms-functions.php
View File

@ -1581,10 +1581,10 @@ function wpmu_welcome_user_notification( $user_id, $password, $meta = array() )
} }
/** /**
* Get the current site info. * Get the current network.
* *
* Returns an object containing the 'id', 'domain', 'path', and 'site_name' * Returns an object containing the 'id', 'domain', 'path', and 'site_name'
* properties of the site being viewed. * properties of the network being viewed.
* *
* @see wpmu_current_site() * @see wpmu_current_site()
* *

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.5-alpha-36292'; $wp_version = '4.5-alpha-36293';
/** /**
* 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.