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

Multisite: Replace `wp_get_network()` internals with `get_network()`. 

`get_network()` should be considered a replacement for `wp_get_network()`.

Props flixos90.
Fixes #32504.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37837 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Jeremy Felt 2016-06-28 21:29:29 +00:00
parent b99a31d35c
commit 31f2f68e82
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/ms-load.php
View File

@ -137,15 +137,15 @@ function get_network_by_path( $domain, $path, $segments = null ) {
* *
* @since 3.9.0 * @since 3.9.0
* @since 4.4.0 Converted to leverage WP_Network * @since 4.4.0 Converted to leverage WP_Network
* @since 4.6.0 Converted to use `get_network()`
* *
* @param object|int $network The network's database row or ID. * @param object|int $network The network's database row or ID.
* @return WP_Network|false Object containing network information if found, false if not. * @return WP_Network|false Object containing network information if found, false if not.
*/ */
function wp_get_network( $network ) { function wp_get_network( $network ) {
if ( ! is_object( $network ) ) { $network = get_network( $network );
$network = WP_Network::get_instance( $network ); if ( null === $network ) {
} else { return false;
$network = new WP_Network( $network );
} }
return $network; return $network;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.6-alpha-37895'; $wp_version = '4.6-alpha-37896';
/** /**
* 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.