vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-11 12:20:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Multisite: Use get_site_by() in get_id_from_blogname().

Browse Source 
Fixes #42091.


git-svn-id: https://develop.svn.wordpress.org/trunk@41743 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jeremy Felt
2017-10-04 18:44:36 +00:00
parent 5c928c9c0e
commit ce6dd8e530
1 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wp-includes/ms-blogs.php
+5 -20
View File
@@ -70,38 +70,23 @@ function get_blogaddress_by_name( $blogname ) {
}
/**
* Retrieves a sites ID given its (subdomain or directory) slug.
* Retrieves a site's ID given its (subdomain or directory) slug.
*
* @since MU (3.0.0)
* @since 4.7.0 Converted to use get_sites().
* @since 4.9.0 Converted to use get_site_by().
*
* @param string $slug A site's slug.
* @return int|null The site ID, or null if no site is found for the given slug.
*/
function get_id_from_blogname( $slug ) {
$current_network = get_network();
$slug = trim( $slug, '/' );
$result = get_site_by( 'slug', $slug );
if ( is_subdomain_install() ) {
$domain = $slug . '.' . preg_replace( '|^www\.|', '', $current_network->domain );
$path = $current_network->path;
} else {
$domain = $current_network->domain;
$path = $current_network->path . $slug . '/';
}
$site_ids = get_sites( array(
'number' => 1,
'fields' => 'ids',
'domain' => $domain,
'path' => $path,
) );
if ( empty( $site_ids ) ) {
if ( ! $result ) {
return null;
}
return array_shift( $site_ids );
return $result->id;
}
/**