Changeset 41241 for trunk/src/wp-admin/includes/ms.php

Timestamp:

08/12/2017 12:47:38 PM (8 years ago)

Author:

flixos90

Message:

Multisite: Rename internal $site_id variables referencing networks to $network_id.

This change improves code clarity by using the current naming conventions for networks.

Props lemacarl.
Fixes #41510.

File:

• trunk/src/wp-admin/includes/ms.php (modified) (3 diffs)

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

@@ -788 +788 @@
  * Whether or not we can edit this network from this page.
  *
- * By default editing of network is restricted to the Network Admin for that `$site_id`
- * this allows for this to be overridden.
+ * By default editing of network is restricted to the Network Admin for that `$network_id`.
+ * This function allows for this to be overridden.
  *
  * @since 3.1.0
@@ -795 +795 @@
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param int $site_id The network/site ID to check.
+ * @param int $network_id The network ID to check.
  * @return bool True if network can be edited, otherwise false.
  */
-function can_edit_network( $site_id ) {
+function can_edit_network( $network_id ) {
     global $wpdb;
 
-    if ( $site_id == $wpdb->siteid )
+    if ( $network_id == $wpdb->siteid )
         $result = true;
     else
@@ -811 +811 @@
      * @since 3.1.0
      *
-     * @param bool $result  Whether the network can be edited from this page.
-     * @param int  $site_id The network/site ID to check.
+     * @param bool $result     Whether the network can be edited from this page.
+     * @param int  $network_id The network ID to check.
      */
-    return apply_filters( 'can_edit_network', $result, $site_id );
+    return apply_filters( 'can_edit_network', $result, $network_id );
 }