sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Multisite: Handle get_id_from_blogname() lookups when the network domain has www..

Browse Source 
Previously, if a network's domain started with `www.` in a subdomain configuration, a slug lookup with `get_id_from_blogname()` would not match an existing site. A similar lookup in a subdirectory configuration would work fine.

This strips `www.` from the network's domain in a subdomain configuration during the lookup and returns the site as expected.

Adds tests which would previously fail in a subdomain configuration, but now pass in both configurations.

Props igmoweb, flixos90.
Fixes #34450.


git-svn-id: https://develop.svn.wordpress.org/trunk@38658 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jeremy Felt 2016-09-27 17:56:53 +00:00
parent 61f014b9fc
commit 1f143d995b
2 changed files with 113 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wp-includes/ms-blogs.php
View File

@ -92,7 +92,7 @@ function get_id_from_blogname( $slug ) {
return $blog_id;
if ( is_subdomain_install() ) {
$domain = $slug . '.' . $current_site->domain;
$domain = $slug . '.' . preg_replace( '|^www\.|', '', $current_site->domain );
$path = $current_site->path;
} else {
$domain = $current_site->domain;

112
tests/phpunit/tests/multisite/getIdFromBlogname.php Normal file
View File

@ -0,0 +1,112 @@
<?php
if ( is_multisite() ) :
/**
* Test get_id_from_blogname() in multisite.
*
* @group blogname
* @group ms-site
* @group multisite
*/
class Tests_Multisite_Get_Id_From_Blogname extends WP_UnitTestCase {
protected static $network_ids;
protected static $site_ids;
public static function wpSetUpBeforeClass( $factory ) {
self::$network_ids = array(
'wordpress.org/' => array( 'domain' => 'wordpress.org', 'path' => '/' ),
'www.wordpress.net/' => array( 'domain' => 'www.wordpress.net', 'path' => '/' ),
);
foreach ( self::$network_ids as &$id ) {
$id = $factory->network->create( $id );
}
unset( $id );
self::$site_ids = array(
'wordpress.org/' => array( 'domain' => 'wordpress.org', 'path' => '/', 'site_id' => self::$network_ids['wordpress.org/'] ),
'foo.wordpress.org/' => array( 'domain' => 'foo.wordpress.org', 'path' => '/', 'site_id' => self::$network_ids['wordpress.org/'] ),
'wordpress.org/foo/' => array( 'domain' => 'wordpress.org', 'path' => '/foo/', 'site_id' => self::$network_ids['wordpress.org/'] ),
'www.wordpress.net/' => array( 'domain' => 'www.wordpress.net', 'path' => '/', 'site_id' => self::$network_ids['www.wordpress.net/'] ),
'foo.wordpress.net/' => array( 'domain' => 'foo.wordpress.net', 'path' => '/', 'site_id' => self::$network_ids['www.wordpress.net/'] ),
'www.wordpress.net/foo/' => array( 'domain' => 'www.wordpress.net', 'path' => '/foo/', 'site_id' => self::$network_ids['www.wordpress.net/'] ),
);
foreach ( self::$site_ids as &$id ) {
$id = $factory->blog->create( $id );
}
unset( $id );
}
public static function wpTearDownAfterClass() {
global $wpdb;
foreach( self::$site_ids as $id ) {
wpmu_delete_blog( $id, true );
}
foreach( self::$network_ids as $id ) {
$wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->sitemeta} WHERE site_id = %d", $id ) );
$wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->site} WHERE id= %d", $id ) );
}
wp_update_network_site_counts();
}
/**
* @ticket 34450
*/
public function test_get_id_from_blogname_no_www() {
global $current_site;
$original_network = $current_site;
$current_site = get_network( self::$network_ids['wordpress.org/'] );
if ( is_subdomain_install() ) {
$expected = self::$site_ids['foo.wordpress.org/'];
} else {
$expected = self::$site_ids['wordpress.org/foo/'];
}
$result = get_id_from_blogname( 'foo' );
$current_site = $original_network;
$this->assertEquals( $expected, $result );
}
/**
* @ticket 34450
*/
public function test_get_id_from_blogname_www() {
global $current_site;
$original_network = $current_site;
$current_site = get_network( self::$network_ids['www.wordpress.net/'] );
if ( is_subdomain_install() ) {
$expected = self::$site_ids['foo.wordpress.net/'];
} else {
$expected = self::$site_ids['www.wordpress.net/foo/'];
}
$result = get_id_from_blogname( 'foo' );
$current_site = $original_network;
$this->assertEquals( $expected, $result );
}
public function test_get_id_from_blogname_invalid_slug() {
global $current_site;
$original_network = $current_site;
$current_site = get_network( self::$network_ids['wordpress.org/'] );
$result = get_id_from_blogname( 'bar' );
$current_site = $original_network;
$this->assertEquals( null, $result );
}
}
endif;