Changeset 37930

Timestamp:

06/30/2016 04:58:06 PM (8 years ago)

Author:

jeremyfelt

Message:

Multisite: Simplify logic assigning orderby in get_site_by_path().

Before [37628], there were 3 separate conditions for ordering by domain and/or path in get_site_by_path() that each resulted in it's own query. Now that get_sites() is used and supports WP_Site_Query, this can be simplified.

Props spacedmonkey.
Fixes #37215.

File:

• trunk/src/wp-includes/ms-load.php (modified) (1 diff)

trunk/src/wp-includes/ms-load.php

@@ -240 +240 @@
     );
 
-    if ( count( $domains ) > 1 && count( $paths ) > 1 ) {
-        $args['orderby'] = 'domain_length path_length';
-        $args['order'] = 'DESC DESC';
-    } elseif ( count( $domains ) > 1 ) {
-        $args['orderby'] = 'domain_length';
-        $args['order'] = 'DESC';
-    } elseif ( count( $paths ) > 1 ) {
-        $args['orderby'] = 'path_length';
-        $args['order'] = 'DESC';
+    if ( count( $domains ) > 1 ) {
+        $args['orderby']['domain_length'] = 'DESC';
+    }
+
+    if ( count( $paths ) > 1 ) {
+        $args['orderby']['path_length'] = 'DESC';
     }