Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 17:18:32 +01:00
Code Issues Projects Releases Wiki Activity

Multisite: Correct default value for orderby in WP_Network_Query::__construct().

Browse Source 
Add a unit test.

See #32504.
Built from https://develop.svn.wordpress.org/trunk@38102


git-svn-id: http://core.svn.wordpress.org/trunk@38043 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2016-07-19 13:10:29 +00:00
parent f645178391
commit a7c72c31cf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/class-wp-network-query.php
View File

@ -108,8 +108,8 @@ class WP_Network_Query {
* Default 0.
* @type bool $no_found_rows Whether to disable the `SQL_CALC_FOUND_ROWS` query. Default true.
* @type string|array $orderby Network status or array of statuses. Accepts 'id', 'domain', 'path',
* 'domain_length', 'path_length' and 'network__in'. Also accepts false, an empty array, or 'none' to disable
* `ORDER BY` clause. Default 'id'.
* 'domain_length', 'path_length' and 'network__in'. Also accepts false,
* an empty array, or 'none' to disable `ORDER BY` clause. Default 'id'.
* @type string $order How to order retrieved networks. Accepts 'ASC', 'DESC'. Default 'ASC'.
* @type string $domain Limit results to those affiliated with a given network ID.
* Default current network ID.
@ -132,7 +132,7 @@ class WP_Network_Query {
'number' => '',
'offset' => '',
'no_found_rows' => true,
'orderby' => '',
'orderby' => 'id',
'order' => 'ASC',
'domain' => '',
'domain__in' => '',

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.6-beta3-38101';
$wp_version = '4.6-beta3-38102';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.