Changeset 58862

Timestamp:

08/07/2024 07:41:14 PM (2 years ago)

Author:

hellofromTonya

Message:

Media: Check if content URL includes a hostname in wp_calculate_image_srcset().

This resolves an Undefined array key "host" PHP warning if WP_CONTENT_URL is set to a relative URL.

Follow-up to [58097].

Reviewed by hellofromTonya.
Merges [58773] to the 6.6 branch.

Props mattraines, narenin, pamprn, SergeyBiryukov.
Fixes #61690.

Location:

branches/6.6

Files:

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

branches/6.6/src/wp-includes/media.php

@@ -1367 +1367 @@
          */
         if ( is_ssl() && ! str_starts_with( $image_baseurl, 'https' ) ) {
-                // Since the `Host:` header might contain a port we should
-                // compare it against the image URL using the same port.
+                /*
+                 * Since the `Host:` header might contain a port, it should
+                 * be compared against the image URL using the same port.
+                 */
                 $parsed = parse_url( $image_baseurl );
-                $domain = $parsed['host'];
+                $domain = isset( $parsed['host'] ) ? $parsed['host'] : '';
+
                 if ( isset( $parsed['port'] ) ) {
                         $domain .= ':' . $parsed['port'];
                 }
+
                 if ( $_SERVER['HTTP_HOST'] === $domain ) {
                         $image_baseurl = set_url_scheme( $image_baseurl, 'https' );

branches/6.6/tests/phpunit/tests/media.php

@@ -1832 +1832 @@
                         $this->assertSame( $expected_srcset, wp_calculate_image_srcset( $size_array, $image_url, $image_meta ) );
                 }
+        }
+
+        /**
+         * @ticket 61690
+         * @requires function imagejpeg
+         */
+        public function test_wp_calculate_image_srcset_with_relative_content_url() {
+                $_SERVER['HTTPS'] = 'on';
+
+                add_filter(
+                        'upload_dir',
+                        static function ( $upload_dir ) {
+                                $upload_dir['baseurl'] = '/wp-content/uploads';
+                                return $upload_dir;
+                        }
+                );
+
+                $image_url  = wp_get_attachment_image_url( self::$large_id, 'medium' );
+                $image_meta = wp_get_attachment_metadata( self::$large_id );
+
+                $size_array = array( 300, 225 );
+
+                $srcset = wp_calculate_image_srcset( $size_array, $image_url, $image_meta );
+
+                $this->assertStringStartsWith( '/wp-content/uploads', $srcset );
         }