sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Add a unit test.

See #32504.

git-svn-id: https://develop.svn.wordpress.org/trunk@38102 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2016-07-19 13:09:39 +00:00
parent b9606d3c4a
commit 87376166f2
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

21
tests/phpunit/tests/multisite/networkQuery.php
View File

@ -59,6 +59,27 @@ class Tests_Multisite_Network_Query extends WP_UnitTestCase {
$this->assertEquals( 3, count( $found ) ); $this->assertEquals( 3, count( $found ) );
} }
public function test_wp_network_query_by_network__in_with_order() {
$expected = array( self::$network_ids['wordpress.org/'], self::$network_ids['make.wordpress.org/'] );
$q = new WP_Network_Query();
$found = $q->query( array(
'fields' => 'ids',
'network__in' => $expected,
'order' => 'ASC',
) );
$this->assertEquals( $expected, $found );
$found = $q->query( array(
'fields' => 'ids',
'network__in' => $expected,
'order' => 'DESC',
) );
$this->assertEquals( array_reverse( $expected ), $found );
}
public function test_wp_network_query_by_network__in_with_single_id() { public function test_wp_network_query_by_network__in_with_single_id() {
$expected = array( self::$network_ids['wordpress.org/'] ); $expected = array( self::$network_ids['wordpress.org/'] );