Permalink
Browse files

Multisite: Deprecate `wp_get_network()`.

`wp_get_network()` was converted into a wrapper for `get_network()` in 4.6.0 and can now be deprecated.

This moves `wp_get_network()` to the bottom of `ms-load.php` as `ms-deprecated.php` is not available early enough.

Props PieWP, flixos90.
Fixes #37553.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38456 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
1 parent a3b581c commit 58bca4922709aae51a50646796c86895e0035265 @jeremyfelt jeremyfelt committed Sep 2, 2016
Showing with 24 additions and 20 deletions.
  1. +23 −19 wp-includes/ms-load.php
  2. +1 −1 wp-includes/version.php
@@ -134,25 +134,6 @@ function get_network_by_path( $domain, $path, $segments = null ) {
}
/**
- * Retrieve an object containing information about the requested network.
- *
- * @since 3.9.0
- *
- * @internal In 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 ) {
- $network = get_network( $network );
- if ( null === $network ) {
- return false;
- }
-
- return $network;
-}
-
-/**
* Retrieve a site object by its domain and path.
*
* @since 3.9.0
@@ -542,3 +523,26 @@ function wpmu_current_site() {
_deprecated_function( __FUNCTION__, '3.9.0' );
return $current_site;
}
+
+/**
+ * Retrieve an object containing information about the requested network.
+ *
+ * @since 3.9.0
+ * @deprecated 4.7.0 Use `get_network()`
+ * @see get_network()
+ *
+ * @internal In 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 ) {
+ _deprecated_function( __FUNCTION__, '4.7.0', 'get_network()' );
+
+ $network = get_network( $network );
+ if ( null === $network ) {
+ return false;
+ }
+
+ return $network;
+}
@@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
-$wp_version = '4.7-alpha-38514';
+$wp_version = '4.7-alpha-38515';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

0 comments on commit 58bca49

Please sign in to comment.