Rename site_id to network_id in multisite functions

[spacedmonkey]

In many multisite functions use variable named $site_id which references the id of the network. This is confusing, as the current naming in multisite is network and site. In an effort have better self documentation, these variables should be changed.

[spacedmonkey]

Looping @DrewAPicture into this one, as it is docs related.

[DrewAPicture]

@spacedmonkey Care to work up a patch?

@jeremyfelt @flixos90 What's your take here?

[spacedmonkey]

@DrewAPicture I mark this as a good first bug, as I want to give it to a newbe. If the ticket is here at the end of 4.9, I will make up a patch.

[flixos90]

I think it's a good idea to change $site_id to $network_id everywhere. Even more important than the variables though, there are a few occurrences even in doc-blocks where the term "site" is used where it should be "network". Maybe that could happen through this ticket as well.

I'd like to highlight though that at this point let's not change $blog_id to $site_id. This should definitely happen at some point, but not before the term "site" is not used for a network anywhere anymore. Furthermore we need some more site-related functions with "site" instead of "blog" in the name for it to make sense (this is something that is underway, but happens organically over time).

To summarize, in the near future a world of $blog_id/$site_id for sites and $network_id for networks is the thing to aim for. This at least clears up the double meaning for the term "site".

[lemacarl]

@spacedmonkey It looks like this bug also extends to the DB because the column name site_id is also used instead of network_id which is how it is used by insert_blog in multisite functions. In fact the ​Codex explicitly states that the the site_id identifies the network. In which case this bug would cover the entire problem. How do I proceed?

[flixos90]

@lemacarl Unfortunately the database schema is nothing we can change here. In those cases, it must remain as is.

[lemacarl]

@flixos90 Ok. Thanks.

[flixos90]

@lemacarl It's only a minor issue, but could you make sure that you update the indentation of the docblocks? Now that the parameter names have been changed from $site_id to the longer $network_id, the following descriptions are not in line with the other parameters anymore.

[lemacarl]

@flixos90 I've aligned the docblocks in the new patch

[spacedmonkey]

Place that were missed.

wp-db.php
public function set_blog_id( $blog_id, $site_id = 0 ) {

if ( ! empty( $site_id ) )

$this->siteid = $site_id;

can_edit_network( $site_id )

ms-settings.php

$site_id = $current_blog->site_id;
wp_load_core_site_options( $site_id );

option.php
wp_load_core_site_options
ms-deprecated.php
get_admin_users_for_domain

@lemacarl do you want to update the patch with these other places.

[flixos90]

Replying to spacedmonkey:

ms-settings.php

$site_id = $current_blog->site_id;
wp_load_core_site_options( $site_id );

Careful: That occurrence must not be changed, since it globalizes the variable. Changing this is part of #41285.

[lemacarl]

@spacedmonkey Cool. On it

[spacedmonkey]

Looks good to me.

[flixos90]

@lemacarl Thanks for following up on this. I fixed some spacing issues in 41510.diff​. Be aware that per the coding standards, spaces should be used for indenting parameter documentation. The return documentation doesn't need to be aligned with the parameter indentation.

[flixos90]

In 41241:

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.