Changeset 38085

Timestamp:

07/17/2016 11:29:11 PM (10 years ago)

Author:

SergeyBiryukov

Message:

Multisite: Correct default values for orderby and order in WP_Site_Query::__construct().

Add a unit test.

Props ramiy, SergeyBiryukov.
See #35791.

Location:

trunk

Files:

• src/wp-includes/class-wp-site-query.php (modified) (1 diff)
• tests/phpunit/tests/multisite/siteQuery.php (modified) (1 diff)

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

@@ -156 +156 @@
                         'offset'            => '',
                         'no_found_rows'     => true,
-                        'orderby'           => 'ids',
-                        'order'             => 'DESC',
+                        'orderby'           => 'id',
+                        'order'             => 'ASC',
                         'network_id'        => 0,
                         'network__in'       => '',

trunk/tests/phpunit/tests/multisite/siteQuery.php

@@ -164 +164 @@
         }
 
+        public function test_wp_site_query_by_network_id_with_order() {
+                $q = new WP_Site_Query();
+                $found = $q->query( array(
+                        'fields'     => 'ids',
+                        'network_id' => self::$network_ids['wordpress.org/'],
+                        'number'     => 3,
+                        'order'      => 'ASC',
+                ) );
+
+                $expected = array(
+                        self::$site_ids['wordpress.org/'],
+                        self::$site_ids['wordpress.org/foo/'],
+                        self::$site_ids['wordpress.org/foo/bar/'],
+                );
+
+                $this->assertEquals( $expected, $found );
+
+                $found = $q->query( array(
+                        'fields'     => 'ids',
+                        'network_id' => self::$network_ids['wordpress.org/'],
+                        'number'     => 3,
+                        'order'      => 'DESC',
+                ) );
+
+                $this->assertEquals( array_reverse( $expected ), $found );
+        }
+
         public function test_wp_site_query_by_network_id_with_existing_sites() {
                 $q = new WP_Site_Query();