Replace $wpdb->siteid with get_current_network_id()

[spacedmonkey]

The helper function get_current_network_id() was introduced in 4.6. It is already used in a number of places, however there was still references to $wpdb->siteid throughout the core.

[spacedmonkey]

Usage in

• get_active_blog_for_user
• wpmu_activate_signup
• get_last_updated
• can_edit_network

Less important as deprecated

• wp_get_sites
• get_admin_users_for_domain
• get_blog_list
• validate_another_blog_signup

[sathyapulse]

@spacedmonkey I have attached the patch file with the ticket which addresses the replace of $wpdb->siteid with get_current_network_id() in the functions mentioned. Additionally I found the usage in the function wp_load_core_site_options and replaced it. Could you please check the patch and let me know your thoughts?

[spacedmonkey]

@sathyapulse Great work.

Couple of things. Can you make sure to remove the global $wpdb references and update the docs.

There are also 7 references in the phpunit tests to $wpdb->siteid that should be replaced.

[sathyapulse]

@spacedmonkey I have created a new patch file by removing the global references. I am not sure about the changes in the phpunit tests. It's mostly in the assignment. Could you please be clear what needs to be removed? All the 7 occurrences?

[spacedmonkey]

41507.2.diff removes references to $wpdb->siteid in test. This basically means it is deprecated and is not used for anything.

@flixos90 what are your thoughts on officially deprecating it at some point.

[flixos90]

41507.3.diff​ ensures that it applies cleanly after the changes made in [41241]. It furthermore removes the hacky network switching logic from the unit tests completely, since that is no longer necessary as wp_update_network_site_counts() and wp_update_network_user_counts() now accept the $network_id as parameter.

[flixos90]

In 41242:

Multisite: Remove references to $wpdb->siteid and use get_current_network_id() instead.

Props sathyapulse, spacedmonkey.
Fixes #41507.