From 4789f30c40f76a1948d0bd033bbab1d8fa3fa087 Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremy.felt@gmail.com>
Date: Thu, 30 Jun 2016 16:59:29 +0000
Subject: [PATCH] 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.

Built from https://develop.svn.wordpress.org/trunk@37930


git-svn-id: http://core.svn.wordpress.org/trunk@37871 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/ms-load.php | 15 ++++++---------
 wp-includes/version.php |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/wp-includes/ms-load.php b/wp-includes/ms-load.php
index afacfe0077..536dfb57a5 100644
--- a/wp-includes/ms-load.php
+++ b/wp-includes/ms-load.php
@@ -239,15 +239,12 @@ function get_site_by_path( $domain, $path, $segments = null ) {
 		'number' => 1,
 	);
 
-	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';
 	}
 
 	$result = get_sites( $args );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 0a90b08a90..20cb8ed97b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-beta1-37929';
+$wp_version = '4.6-beta1-37930';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.