Skip to content

Check for existing $metadata['sizes'] to fix PHP warning #648

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

Merged
mukeshpanchal27 merged 1 commit into from
Feb 13, 2023
Merged

Check for existing $metadata['sizes'] to fix PHP warning #648

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
57 changes: 30 additions & 27 deletions modules/images/webp-uploads/load.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,37 +590,40 @@ function webp_uploads_img_tag_update_mime_type( $original_image, $context, $atta
}
}

// Replace sub sizes for the image if present.
foreach ( $metadata['sizes'] as $size => $size_data ) {
if ( empty( $size_data['file'] ) ) {
continue;
}

foreach ( $target_mimes as $target_mime ) {
if ( $target_mime === $original_mime ) {
continue;
}

if ( ! isset( $size_data['sources'][ $target_mime ]['file'] ) ) {
continue;
}
if ( isset( $metadata['sizes'] ) && is_array( $metadata['sizes'] ) ) {
// Replace sub sizes for the image if present.
foreach ( $metadata['sizes'] as $size => $size_data ) {

if ( $size_data['file'] === $size_data['sources'][ $target_mime ]['file'] ) {
if ( empty( $size_data['file'] ) ) {
continue;
}

/** This filter is documented in modules/images/webp-uploads/load.php */
$filtered_image = (string) apply_filters( 'webp_uploads_pre_replace_additional_image_source', $image, $attachment_id, $size, $target_mime, $context );

// If filtered image is same as the image, run our own replacement logic, otherwise rely on the filtered image.
if ( $filtered_image === $image ) {
$image = str_replace(
$size_data['file'],
$size_data['sources'][ $target_mime ]['file'],
$image
);
} else {
$image = $filtered_image;
foreach ( $target_mimes as $target_mime ) {
if ( $target_mime === $original_mime ) {
continue;
}

if ( ! isset( $size_data['sources'][ $target_mime ]['file'] ) ) {
continue;
}

if ( $size_data['file'] === $size_data['sources'][ $target_mime ]['file'] ) {
continue;
}

/** This filter is documented in modules/images/webp-uploads/load.php */
$filtered_image = (string) apply_filters( 'webp_uploads_pre_replace_additional_image_source', $image, $attachment_id, $size, $target_mime, $context );

// If filtered image is same as the image, run our own replacement logic, otherwise rely on the filtered image.
if ( $filtered_image === $image ) {
$image = str_replace(
$size_data['file'],
$size_data['sources'][ $target_mime ]['file'],
$image
);
} else {
$image = $filtered_image;
}
}
}
}
Expand Down