WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Networks and Sites: In `get_site_by_path()`, use single `domain` and `path` parameters if there's only one item to look for. 

This should increase the chances of `WP_Site_Query::get_sites()` hitting an existing cache.

Props spacedmonkey.
Fixes #42299.
Built from https://develop.svn.wordpress.org/trunk@42698


git-svn-id: http://core.svn.wordpress.org/trunk@42526 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2018-02-11 17:09:31 +00:00
parent f88dddcab5
commit 4a55ea5e68
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/ms-load.php
View File

@ -234,17 +234,21 @@ function get_site_by_path( $domain, $path, $segments = null ) {
} }
$args = array( $args = array(
'domain__in' => $domains,
'path__in' => $paths,
'number' => 1, 'number' => 1,
); );
if ( count( $domains ) > 1 ) { if ( count( $domains ) > 1 ) {
$args['domain__in'] = $domains;
$args['orderby']['domain_length'] = 'DESC'; $args['orderby']['domain_length'] = 'DESC';
} else {
$args['domain'] = array_shift( $domains );
} }
if ( count( $paths ) > 1 ) { if ( count( $paths ) > 1 ) {
$args['path__in'] = $paths;
$args['orderby']['path_length'] = 'DESC'; $args['orderby']['path_length'] = 'DESC';
} else {
$args['path'] = array_shift( $paths );
} }
$result = get_sites( $args ); $result = get_sites( $args );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.0-alpha-42697'; $wp_version = '5.0-alpha-42698';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.