Changeset 34890

Timestamp:

10/07/2015 01:06:58 AM (8 years ago)

Author:

wonderboymusic

Message:

Rewrite/Permalinks/Canonical: in url_to_postid(), call set_url_scheme() on the URL to combat mixed content issues and find posts cross-scheme.

Adds unit tests.

Props swissspidy.
Fixes #34144.

Location:

trunk

Files:

• src/wp-includes/rewrite-functions.php (modified) (1 diff)
• tests/phpunit/tests/rewrite.php (modified) (1 diff)

trunk/src/wp-includes/rewrite-functions.php

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

trunk/tests/phpunit/tests/rewrite.php

@@ -93 +93 @@
     }
 
+    function test_url_to_postid_set_url_scheme_https_to_http() {
+        $post_id = $this->factory->post->create();
+        $permalink = get_permalink( $post_id );
+        $this->assertEquals( $post_id, url_to_postid( set_url_scheme( $permalink, 'https' ) ) );
+
+        $post_id = $this->factory->post->create( array( 'post_type' => 'page' ) );
+        $permalink = get_permalink( $post_id );
+        $this->assertEquals( $post_id, url_to_postid( set_url_scheme( $permalink, 'https' ) ) );
+    }
+
+    function test_url_to_postid_set_url_scheme_http_to_https() {
+        // Save server data for cleanup
+        $is_ssl = is_ssl();
+        $http_host = $_SERVER['HTTP_HOST'];
+
+        $_SERVER['HTTPS'] = 'on';
+
+        $post_id = $this->factory->post->create();
+        $permalink = get_permalink( $post_id );
+        $this->assertEquals( $post_id, url_to_postid( set_url_scheme( $permalink, 'http' ) ) );
+
+        $post_id = $this->factory->post->create( array( 'post_type' => 'page' ) );
+        $permalink = get_permalink( $post_id );
+        $this->assertEquals( $post_id, url_to_postid( set_url_scheme( $permalink, 'http' ) ) );
+
+        // Cleanup.
+        $_SERVER['HTTPS'] = $is_ssl ? 'on' : 'off';
+        $_SERVER['HTTP_HOST'] = $http_host;
+    }
+
     function test_url_to_postid_custom_post_type() {
         delete_option( 'rewrite_rules' );