Changeset 38515

Timestamp:

09/02/2016 11:48:00 PM (9 years ago)

Author:

jeremyfelt

Message:

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.

File:

• trunk/src/wp-includes/ms-load.php (modified) (2 diffs)

trunk/src/wp-includes/ms-load.php

@@ -132 +132 @@
 function get_network_by_path( $domain, $path, $segments = null ) {
     return WP_Network::get_by_path( $domain, $path, $segments );
-}
-
-/**
- * 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;
 }
 
@@ -543 +524 @@
     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;
+}