Changeset 33705

Timestamp:

08/22/2015 04:38:09 PM (9 years ago)

Author:

wonderboymusic

Message:

Ensure that attachment_url_to_postid() matches cross-scheme when front-end and back-end schemes are different.

Adds unit test.

Props welcher.
Fixes #33109.

Location:

trunk

Files:

• src/wp-includes/media.php (modified) (2 diffs)
• tests/phpunit/tests/media.php (modified) (1 diff)

trunk/src/wp-includes/media.php

@@ -3432 +3432 @@
     $path = $url;
 
+    $site_url = parse_url( $dir['url'] );
+    $image_path = parse_url( $path );
+
+    //force the protocols to match if needed
+    if ( isset( $image_path['scheme'] ) && ( $image_path['scheme'] !== $site_url['scheme'] ) ) {
+        $path = str_replace( $image_path['scheme'], $site_url['scheme'], $path );
+    }
+
     if ( 0 === strpos( $path, $dir['baseurl'] . '/' ) ) {
         $path = substr( $path, strlen( $dir['baseurl'] . '/' ) );
@@ -3450 +3458 @@
      * @param string   $url     The URL being looked up.
      */
-    $post_id = apply_filters( 'attachment_url_to_postid', $post_id, $url );
-
-    return (int) $post_id;
+    return (int) apply_filters( 'attachment_url_to_postid', $post_id, $url );
 }
 

trunk/tests/phpunit/tests/media.php

@@ -534 +534 @@
         $image_url  = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $image_path;
         $this->assertEquals( $attachment_id, attachment_url_to_postid( $image_url ) );
+    }
+
+    function test_attachment_url_to_postid_schemes() {
+        $image_path = '2014/11/' . $this->img_name;
+        $attachment_id = $this->factory->attachment->create_object( $image_path, 0, array(
+            'post_mime_type' => 'image/jpeg',
+            'post_type'      => 'attachment',
+        ) );
+
+        /**
+         * @ticket 33109 Testing protocols not matching
+         */
+        $image_url  = 'https://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $image_path;
+        $this->assertEquals( $attachment_id, attachment_url_to_postid( $image_url ) );
+    }
+
+    function test_attachment_url_to_postid_filtered() {
+        $image_path = '2014/11/' . $this->img_name;
+        $attachment_id = $this->factory->attachment->create_object( $image_path, 0, array(
+            'post_mime_type' => 'image/jpeg',
+            'post_type'      => 'attachment',
+        ) );
 
         add_filter( 'upload_dir', array( $this, '_upload_dir' ) );