Use get_sites in Network upgrade

[spacedmonkey]

Instead of using raw sql query in upgrade.php, use the new get_sites function.

[flixos90]

+1 for this.

There's a small problem in line 63 of the patch though, number needs to be 5, and we need to include offset => $n in the arguments.

[johnjamesjacoby]

+1 from me also, once @flixos90's recommendations.

I'd also prefer to not use $args as a one-time variable, and do this instead:

$blogs = get_sites( array(
	'spam'       => '0',
	'deleted'    => '0',
	'archived'   => '0',
	'network_id' => get_current_network_id(),
	'fields'     => 'ids',
	'number'     => 5,
	'offset'     => $n,
	'order'      => 'DESC',
	'orderby'    => 'id',
) ); 

[flixos90]

37823.5.diff​ has the number and offset argument correct.

[flixos90]

Maybe we should move the relevant parts here into an actual function, something like upgrade_network_sites(). This would allow us to better add unit tests for it.

[jorbin]

@jeremyfelt Can you review the above patch please

[jeremyfelt]

Replying to flixos90:

Maybe we should move the relevant parts here into an actual function, something like upgrade_network_sites(). This would allow us to better add unit tests for it.

37823.5.diff​ looks good. Let's hold off on creating an upgrade_network_sites() or similar until we explore #11869, #37799, and others a bit more. We may end up refactoring this page in other ways.

[jeremyfelt]

In 38680:

Multisite: Use get_sites() in network upgrade.

Use get_sites() to generate the same query that was previously performed manually.

Props spacedmonkey, flixos90.
Fixes #37823.

[ocean90]

Replying to jeremyfelt:

In 38680:

Multisite: Use get_sites() in network upgrade.

Use get_sites() to generate the same query that was previously performed manually.

Props spacedmonkey, flixos90.
Fixes #37823.

Nitpicking: spam, deleted, and archived should be integer values. 0️⃣

[jeremyfelt]

Replying to ocean90:

Nitpicking: spam, deleted, and archived should be integer values.

Good catch. :)

[jeremyfelt]

In 38819:

Multisite: Use correct types in get_sites() during network upgrade.

spam, deleted, and archived query args should be integers, not strings.

Props ocean90.
See #37823.