From 204dedb99aaffb1fc03f601945f16700af408116 Mon Sep 17 00:00:00 2001 From: Jeremy Felt Date: Tue, 28 Jun 2016 21:28:48 +0000 Subject: [PATCH] Multisite: Replace `wp_get_network()` internals with `get_network()`. `get_network()` should be considered a replacement for `wp_get_network()`. Props flixos90. Fixes #32504. git-svn-id: https://develop.svn.wordpress.org/trunk@37896 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/ms-load.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wp-includes/ms-load.php b/src/wp-includes/ms-load.php index 759c2699d1..afacfe0077 100644 --- a/src/wp-includes/ms-load.php +++ b/src/wp-includes/ms-load.php @@ -137,15 +137,15 @@ function get_network_by_path( $domain, $path, $segments = null ) { * * @since 3.9.0 * @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. * @return WP_Network|false Object containing network information if found, false if not. */ function wp_get_network( $network ) { - if ( ! is_object( $network ) ) { - $network = WP_Network::get_instance( $network ); - } else { - $network = new WP_Network( $network ); + $network = get_network( $network ); + if ( null === $network ) { + return false; } return $network;