mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-02-12 10:50:25 +01:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Multisite: Simplify logic assigning orderby in get_site_by_path().

Browse Source 
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.


git-svn-id: https://develop.svn.wordpress.org/trunk@37930 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jeremy Felt 2016-06-30 16:58:06 +00:00
parent 7ddfbf589b
commit 229e0d5300
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/wp-includes/ms-load.php
View File

@ -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 );