Skip to content

14110 - Expose height and width attributes to 'wp_get_attachment_image_attributes' filter #8758

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
spacedmonkey wants to merge 10 commits into from
Closed

14110 - Expose height and width attributes to 'wp_get_attachment_image_attributes' filter #8758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
946c629
Ensure width and height attributes are sanitized for images
spacedmonkey Apr 29, 2025
7dc00e9
Optimize image loading attribute handling in `wp_get_attachment_image`.
spacedmonkey Apr 29, 2025
78f4228
Normalize image attributes before unset
spacedmonkey Apr 29, 2025
91b96da
Ensure height and width attributes are numeric before sanitizing.
spacedmonkey Apr 29, 2025
1b98fc4
Simplify height and width attribute handling in media.php.
spacedmonkey Apr 29, 2025
9130c72
Merge branch 'trunk' into fix/height-width
spacedmonkey May 28, 2025
e625cd2
Merge branch 'trunk' into fix/height-width
spacedmonkey May 29, 2025
53776df
Include `width` and `height` in `$attr` after merging with defaults.
spacedmonkey May 29, 2025
d956be4
Merge branch 'trunk' into fix/height-width
spacedmonkey Jun 22, 2025
a3e5ac0
Add PHPUnit tests for `wp_get_attachment_image` attribute filters
spacedmonkey Jun 22, 2025
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
24 changes: 15 additions & 9 deletions src/wp-includes/media.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,7 +1070,6 @@ function wp_get_attachment_image( $attachment_id, $size = 'thumbnail', $icon = f
list( $src, $width, $height ) = $image;

$attachment = get_post( $attachment_id );
$hwstring = image_hwstring( $width, $height );
$size_class = $size;

if ( is_array( $size_class ) ) {
Expand All @@ -1090,15 +1089,14 @@ function wp_get_attachment_image( $attachment_id, $size = 'thumbnail', $icon = f
*
* @param string $context The context. Default 'wp_get_attachment_image'.
*/
$context = apply_filters( 'wp_get_attachment_image_context', 'wp_get_attachment_image' );
$attr = wp_parse_args( $attr, $default_attr );
$context = apply_filters( 'wp_get_attachment_image_context', 'wp_get_attachment_image' );
$attr = wp_parse_args( $attr, $default_attr );
$attr['width'] = $width;
$attr['height'] = $height;

$loading_attr = $attr;
$loading_attr['width'] = $width;
$loading_attr['height'] = $height;
$loading_optimization_attr = wp_get_loading_optimization_attributes(
'img',
$loading_attr,
$attr,
$context
);

Expand Down Expand Up @@ -1169,8 +1167,16 @@ function wp_get_attachment_image( $attachment_id, $size = 'thumbnail', $icon = f
*/
$attr = apply_filters( 'wp_get_attachment_image_attributes', $attr, $attachment, $size );

$attr = array_map( 'esc_attr', $attr );
$html = rtrim( "<img $hwstring" );
if ( isset( $attr['height'] ) && is_numeric( $attr['height'] ) ) {
$height = absint( $attr['height'] );
}
if ( isset( $attr['width'] ) && is_numeric( $attr['width'] ) ) {
$width = absint( $attr['width'] );
}
unset( $attr['height'], $attr['width'] );
$attr = array_map( 'esc_attr', $attr );
$hwstring = image_hwstring( $width, $height );
$html = rtrim( "<img $hwstring" );

foreach ( $attr as $name => $value ) {
$html .= " $name=" . '"' . $value . '"';
Expand Down
47 changes: 47 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 @@ -1583,6 +1583,53 @@ public function test_wp_get_attachment_image_filter_output() {
$this->assertSame( $expected, $output );
}

/**
* @ticket 14110
*/
public function test_wp_get_attachment_image_filter_with_height_width() {
$mock_action = new MockAction();
add_filter( 'wp_get_attachment_image_attributes', array( $mock_action, 'filter' ) );
wp_get_attachment_image( self::$large_id );
$args = $mock_action->get_args();
$this->assertArrayHasKey( '0', $args, 'First argument should be an array.' );
$this->assertArrayHasKey( '0', $args[0], 'First argument should be an array.' );
$this->assertArrayHasKey( 'width', $args[0][0], 'Width should be set.' );
$this->assertArrayHasKey( 'height', $args[0][0], 'Height should be set.' );
}

/**
* @ticket 14110
*/
public function test_wp_get_attachment_image_filter_change_height_width() {
add_filter(
'wp_get_attachment_image_attributes',
static function ( $args ) {
$args['height'] = '999';
$args['width'] = '999';
return $args;
}
);
$output = wp_get_attachment_image( self::$large_id );
$this->assertStringContainsString( 'width="999"', $output, 'Width should be changed.' );
$this->assertStringContainsString( 'height="999"', $output, 'Height should be changed.' );
}

/**
* @ticket 14110
*/
public function test_wp_get_attachment_image_filter_unset_height_width() {
add_filter(
'wp_get_attachment_image_attributes',
static function ( $args ) {
unset( $args['height'], $args['width'] );
return $args;
}
);
$output = wp_get_attachment_image( self::$large_id );
$this->assertStringContainsString( 'width="150"', $output, 'Width should not be changed.' );
$this->assertStringContainsString( 'height="150"', $output, 'Height should not be changed.' );
}

public function filter_wp_get_attachment_image() {
return 'Override wp_get_attachment_image';
}
Expand Down
Loading