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

Photon: avoid deprecation warnings when src is null #39685

Merged
merged 2 commits into from
Oct 10, 2024
Merged

Photon: avoid deprecation warnings when src is null #39685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc80a07
Photon: avoid deprecation warnings when src is null
jeherve Oct 8, 2024
20b0de6
Check for the validity of the src earlier
anomiex Oct 9, 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
4 changes: 4 additions & 0 deletions projects/packages/image-cdn/changelog/fix-photon-deprecation-notice
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fixed

Avoid deprecation notice when an image URL does not have an expected format.
26 changes: 18 additions & 8 deletions projects/packages/image-cdn/src/class-image-cdn.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,11 +357,21 @@ public static function filter_the_content( $content ) {
continue;
}

// Identify image source.
$src_orig = $processor->get_attribute( 'src' );
$src = $src_orig;

/*
* Only examine tags that are considered an image. If encountering
* a closing tag then this is not the image being sought.
* Only examine tags that are considered an image,
* with a valid src attribute.
* If encountering a closing tag then this is not the image being sought.
*/
if ( $processor->is_tag_closer() || ! in_array( $processor->get_tag(), $image_tags, true ) ) {
if (
$processor->is_tag_closer()
|| ! in_array( $processor->get_tag(), $image_tags, true )
|| ! is_string( $src )
|| $src === ''
) {
continue;
}

Expand Down Expand Up @@ -397,10 +407,6 @@ public static function filter_the_content( $content ) {
// Flag if we need to munge a fullsize URL.
$fullsize_url = false;

// Identify image source.
$src_orig = $processor->get_attribute( 'src' );
$src = $src_orig;

/**
* Allow specific images to be skipped by Photon.
*
Expand Down Expand Up @@ -679,7 +685,11 @@ public static function filter_the_content( $content ) {
$processor->set_attribute( 'data-recalc-dims', '1' );
}
}
} elseif ( preg_match( '#^http(s)?://i[\d]{1}.wp.com#', $src ) && is_string( $nearest_preceding_href ) && self::validate_image_url( $nearest_preceding_href ) ) {
} elseif (
preg_match( '#^http(s)?://i[\d]{1}.wp.com#', $src )
&& is_string( $nearest_preceding_href )
&& self::validate_image_url( $nearest_preceding_href )
) {
$processor->seek( 'link' );
$processor->set_attribute( 'href', Image_CDN_Core::cdn_url( $nearest_preceding_href ) );
$processor->seek( 'image' );
Expand Down
Loading