Changeset 38102

Timestamp:

07/19/2016 01:09:39 PM (8 years ago)

Author:

SergeyBiryukov

Message:

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

Add a unit test.

See #32504.

Location:

trunk

Files:

• src/wp-includes/class-wp-network-query.php (modified) (2 diffs)
• tests/phpunit/tests/multisite/networkQuery.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-network-query.php

@@ -109 +109 @@
      *     @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.
@@ -133 +133 @@
             'offset'               => '',
             'no_found_rows'        => true,
-            'orderby'              => '',
+            'orderby'              => 'id',
             'order'                => 'ASC',
             'domain'               => '',

trunk/tests/phpunit/tests/multisite/networkQuery.php

@@ -60 +60 @@
     }
 
+    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() {
         $expected = array( self::$network_ids['wordpress.org/'] );