Skip to content
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

fix width and height metadata condition on svg_dimensions function #174

Merged
merged 3 commits into from
Mar 19, 2024
Merged

fix width and height metadata condition on svg_dimensions function #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c172969
fix width and height metadata condtion on svg_dimensions function
sksaju Feb 12, 2024
822f8db
fix php unit test issue
sksaju Feb 12, 2024
5900612
Update mocked response for the `wp_get_attachment_metadata` function …
iamdharmesh Mar 19, 2024
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 safe-svg.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ protected function svg_dimensions( $attachment_id ) {
$width = 0;
$height = 0;

if ( $svg && ! empty( $metadata['width'] ) && empty( $metadata['height'] ) ) {
if ( $svg && ! empty( $metadata['width'] ) && ! empty( $metadata['height'] ) ) {
$width = floatval( $metadata['width'] );
$height = floatval( $metadata['height'] );
} elseif ( $svg ) {
Expand Down
3 changes: 3 additions & 0 deletions tests/unit/test-safe-svg.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,9 @@ public function test_one_pixel_fix() {
),
),
),
array(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this what wp_get_attachment_metadata() is expected to return following your changes in this and the other PR?

Using svgNoDimensions.svg I don't get a sizes array stored.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@peterwilsoncc I have updated this as per the actual response from the WP for the svgNoDimensions.svg file.

'filesize' => 1001, // wp_get_attachment_metadata response for ./files/svgNoDimensions.svg file doesn't contain dimensions and sizes array.
),
),
)
);
Expand Down
Loading