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.


git-svn-id: https://develop.svn.wordpress.org/trunk@41241 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Felix Arntz
2017-08-12 12:47:38 +00:00
parent 0979d6ebfb
commit 9595e6c38b
5 changed files with 69 additions and 68 deletions

View File

@@ -893,12 +893,13 @@ class wpdb {
* @since 3.0.0
*
* @param int $blog_id
* @param int $site_id Optional.
* @param int $network_id Optional.
* @return int previous blog id
*/
public function set_blog_id( $blog_id, $site_id = 0 ) {
if ( ! empty( $site_id ) )
$this->siteid = $site_id;
public function set_blog_id( $blog_id, $network_id = 0 ) {
if ( ! empty( $network_id ) ) {
$this->siteid = $network_id;
}
$old_blog_id = $this->blogid;
$this->blogid = $blog_id;