Skip to content

#65082 Fix wp_embed_defaults() usage in WP_oEmbed()->fetch() #11591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
roborourke wants to merge 5 commits into from
+69 −1
Closed

#65082 Fix wp_embed_defaults() usage in WP_oEmbed()->fetch() #11591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2519bd1
#65082 Fix wp_embed_defaults() usage in WP_oEmbed()->fetch()
roborourke Apr 16, 2026
d831cc3
Merge branch 'trunk' into fixes-65082-oembed-maxwidth
roborourke Apr 16, 2026
b8a4406
Use brackets when instantiating a new class
roborourke Apr 16, 2026
87523ad
Merge branch 'fixes-65082-oembed-maxwidth' of github.com:roborourke/w…
roborourke Apr 16, 2026
8ab3707
Fix array arrow alignment
roborourke Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/wp-includes/class-wp-oembed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ public function discover( $url ) {
* @return object|false The result in the form of an object on success, false on failure.
*/
public function fetch( $provider, $url, $args = '' ) {
$args = wp_parse_args( $args, wp_embed_defaults( $url ) );
$args = wp_parse_args( $args, array_combine( array( 'width', 'height' ), wp_embed_defaults( $url ) ) );

$provider = add_query_arg( 'maxwidth', (int) $args['width'], $provider );
$provider = add_query_arg( 'maxheight', (int) $args['height'], $provider );
Expand Down
68 changes: 68 additions & 0 deletions tests/phpunit/tests/media.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,65 @@ public function test_autoembed( $content, $result = null ) {
$this->assertSame( $wp_embed->autoembed( $content ), $result ? $result : $content );
}

public function data_oembed() {
$default_embed = wp_embed_defaults();

return array(
array(
'https://example.org/oembed',
'https://youtube.com/?v=xyz',
'',
add_query_arg(
array(
'maxwidth' => (int) $default_embed[0],
'maxheight' => (int) $default_embed[1],
'url' => urlencode( 'https://youtube.com/?v=xyz' ),
'dnt' => 1,
),
'https://example.org/oembed',
),
),
array(
'https://example.org/oembed',
'https://youtube.com/?v=xyz',
'width=1280',
add_query_arg(
array(
'maxwidth' => 1280,
'maxheight' => (int) $default_embed[1],
'url' => urlencode( 'https://youtube.com/?v=xyz' ),
'dnt' => 1,
),
'https://example.org/oembed',
),
),
array(
'https://example.org/oembed',
'https://youtube.com/?v=xyz',
array( 'width' => 1280 ),
add_query_arg(
array(
'maxwidth' => 1280,
'maxheight' => (int) $default_embed[1],
'url' => urlencode( 'https://youtube.com/?v=xyz' ),
'dnt' => 1,
),
'https://example.org/oembed',
),
),
);
}

/**
* @ticket 65082
* @dataProvider data_oembed
*/
public function test_oembed_fetch_url( $provider, $url, $args, $result ) {
$wp_oembed = new Test_oEmbed();

$this->assertSame( $wp_oembed->fetch( $provider, $url, $args ), $result );
}

public function test_wp_prepare_attachment_for_js() {
// Attachment without media.
$id = wp_insert_attachment(
Expand Down Expand Up @@ -7293,3 +7352,12 @@ public function shortcode( $attr, $url = '' ) {
return '[embed]';
}
}

/**
* Helper class for `test_oembed`.
*/
class Test_oEmbed extends WP_oEmbed {
private function _fetch_with_format( $provider_url_with_args, $format ) {
return $provider_url_with_args;
}
}
Loading