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

Rewrite Rules: Ensure url_to_postid() operates as expected when it's used in the context of another site within a Multisite network that uses mixed URL schemes.

Browse Source 
Fixes #35531


git-svn-id: https://develop.svn.wordpress.org/trunk@36750 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
John Blackbourn 2016-02-28 02:12:13 +00:00
parent 717c1c4041
commit 54adcce28d
2 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wp-includes/rewrite.php
View File

@ -487,7 +487,8 @@ function url_to_postid( $url ) {
$url = $url_split[0];
// Set the correct URL scheme.
$url = set_url_scheme( $url );
$scheme = parse_url( home_url(), PHP_URL_SCHEME );
$url = set_url_scheme( $url, $scheme );
// Add 'www.' if it is absent and should be there
if ( false !== strpos(home_url(), '://www.') && false === strpos($url, '://www.') )

54
tests/phpunit/tests/rewrite.php
View File

@ -117,6 +117,60 @@ class Tests_Rewrite extends WP_UnitTestCase {
$this->assertEquals( $page_id, $page_url_to_id );
}
/**
* @ticket 35531
* @group multisite
*/
function test_url_to_postid_of_http_site_when_current_site_uses_https() {
if ( ! is_multisite() ) {
$this->markTestSkipped( 'This test requires multisite' );
}
$_SERVER['HTTPS'] = 'on';
$network_home = home_url();
$this->blog_id_35531 = self::factory()->blog->create();
add_filter( 'home_url', array( $this, '_filter_http_home_url' ), 10, 4 );
switch_to_blog( $this->blog_id_35531 );
$post_id = self::factory()->post->create();
$permalink = get_permalink( $post_id );
$url_to_postid = url_to_postid( $permalink );
restore_current_blog();
// Cleanup.
remove_filter( 'home_url', array( $this, '_filter_http_home_url' ), 10 );
// Test the tests:
$this->assertSame( 'http', parse_url( $permalink, PHP_URL_SCHEME ) );
$this->assertSame( 'https', parse_url( $network_home, PHP_URL_SCHEME ) );
// Test that the url_to_postid() call matched:
$this->assertEquals( $post_id, $url_to_postid );
}
/**
* Enforce an `http` scheme for our target site.
*
* @param string $url The complete home URL including scheme and path.
* @param string $path Path relative to the home URL. Blank string if no path is specified.
* @param string|null $orig_scheme Scheme to give the home URL context.
* @param int|null $blog_id Site ID, or null for the current site.
* @return string The complete home URL including scheme and path.
*/
function _filter_http_home_url( $url, $path, $orig_scheme, $_blog_id ) {
global $blog_id;
if ( $this->blog_id_35531 === $blog_id ) {
return set_url_scheme( $url, 'http' );
}
return $url;
}
function test_url_to_postid_custom_post_type() {
delete_option( 'rewrite_rules' );