Changeset 33705 for trunk/src/wp-includes/media.php

Timestamp:

08/22/2015 04:38:09 PM (11 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.

File:

• trunk/src/wp-includes/media.php (modified) (2 diffs)

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 );
 }