Skip to content

Fix image wrapping logic and regex #2

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

Open
ddegner wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix image wrapping logic and regex #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c28612d
Improve AVIF image conversion with better handling of query strings a…
cursoragent Aug 11, 2025
9cc1340
Refactor image wrapping methods for better AVIF conversion handling
cursoragent Aug 11, 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
129 changes: 88 additions & 41 deletions includes/class-support.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ public function init(): void
$this->uploadsInfo = \wp_upload_dir();
$this->fileCache = \get_transient('avif_local_support_file_cache') ?: [];
add_filter('wp_get_attachment_image', [$this, 'wrapAttachment'], 10, 5);
add_filter('the_content', [$this, 'wrapContentImages']);
add_filter('post_thumbnail_html', [$this, 'wrapContentImages']);
add_filter('wp_content_img_tag', [$this, 'wrapContentImgTag'], 10, 3);
add_filter('post_thumbnail_html', [$this, 'wrapSingleImageHtml'], 10, 1);
add_action('shutdown', [$this, 'saveCache']);
}

Expand Down Expand Up @@ -50,65 +50,112 @@ public function wrapAttachment(string $html, int $attachmentId, $size, bool $ico
return $this->pictureMarkup($html, $avifSrc, $avifSrcset, $sizes);
}

public function wrapContentImages(string $content): string
public function wrapContentImgTag(string $html, string $context, int $attachmentId): string
{
if (\is_admin() || \wp_doing_ajax() || (\defined('REST_REQUEST') && REST_REQUEST)) {
return $content;
return $html;
}
if (!str_contains($content, '<img')) {
return $content;
if ($html === '' || !str_contains($html, '<img')) {
return $html;
}
if (str_contains($content, '<picture') || str_contains($content, 'type="image/avif"')) {
return $content;
if (str_contains($html, '<picture') || str_contains($html, 'type="image/avif"')) {
return $html;
}

$uploadsUrl = $this->uploadsInfo['baseurl'] ?? '';
if (!$uploadsUrl) {
return $content;
if (!preg_match('/src=["\']([^"\']+)["\']/', $html, $srcMatch)) {
return $html;
}
$src = $srcMatch[1];
if (!$this->isUploadsImage($src)) {
return $html;
}

$pattern = sprintf(
'/<img\s+([^>]*?)src=["\'](%s[^"\']*\.(?:jpe?g|JPE?G))["\']([^>]*?)>/i',
preg_quote($uploadsUrl, '/')
);

$result = preg_replace_callback($pattern, function (array $matches): string {
$fullTag = $matches[0];
$src = $matches[2];

$avifSrc = $this->avifUrlFor($src);
if (!$avifSrc) {
return $fullTag;
}
$avifSrc = $this->avifUrlFor($src);
if (!$avifSrc) {
return $html;
}

$avifSrcset = $avifSrc;
if (preg_match('/srcset=["\']([^"\']*)["\']/', $fullTag, $srcsetMatches)) {
$converted = $this->convertSrcsetToAvif($srcsetMatches[1]);
if ($converted) {
$avifSrcset = $converted;
}
$avifSrcset = $avifSrc;
if (preg_match('/srcset=["\']([^"\']*)["\']/', $html, $srcsetMatches)) {
$converted = $this->convertSrcsetToAvif($srcsetMatches[1]);
if ($converted) {
$avifSrcset = $converted;
}
}

$sizes = '';
if (preg_match('/sizes=["\']([^"\']*)["\']/', $fullTag, $sizesMatches)) {
$sizes = $sizesMatches[1];
}
$sizes = '';
if (preg_match('/sizes=["\']([^"\']*)["\']/', $html, $sizesMatches)) {
$sizes = $sizesMatches[1];
}

return $this->pictureMarkup($fullTag, $avifSrc, $avifSrcset, $sizes);
}, $content);
return $this->pictureMarkup($html, $avifSrc, $avifSrcset, $sizes);
}

return $result !== null ? $result : $content;
public function wrapSingleImageHtml(string $html): string
{
if ($html === '' || str_contains($html, '<picture') || str_contains($html, 'type="image/avif"')) {
return $html;
}
if (!preg_match('/src=["\']([^"\']+)["\']/', $html, $srcMatch)) {
return $html;
}
$src = $srcMatch[1];
if (!$this->isUploadsImage($src)) {
return $html;
}
$avifSrc = $this->avifUrlFor($src);
if (!$avifSrc) {
return $html;
}
$avifSrcset = $avifSrc;
if (preg_match('/srcset=["\']([^"\']*)["\']/', $html, $srcsetMatches)) {
$converted = $this->convertSrcsetToAvif($srcsetMatches[1]);
if ($converted) {
$avifSrcset = $converted;
}
}
$sizes = '';
if (preg_match('/sizes=["\']([^"\']*)["\']/', $html, $sizesMatches)) {
$sizes = $sizesMatches[1];
}
return $this->pictureMarkup($html, $avifSrc, $avifSrcset, $sizes);
}

private function avifUrlFor(string $jpegUrl): ?string
{
if (!$this->isUploadsImage($jpegUrl) || !preg_match('/\.(jpe?g|JPE?G)$/', $jpegUrl)) {
if (!$this->isUploadsImage($jpegUrl)) {
return null;
}
$avifUrl = preg_replace('/\.(jpe?g|JPE?G)$/i', '.avif', $jpegUrl);
$relative = str_replace($this->uploadsInfo['baseurl'] ?? '', '', (string) $avifUrl);

$queryString = '';
$jpegUrlNoQuery = $jpegUrl;
$hashPos = strpos($jpegUrl, '#');
$qPos = strpos($jpegUrl, '?');
$cutPos = false;
if ($qPos !== false && $hashPos !== false) {
$cutPos = min($qPos, $hashPos);
} elseif ($qPos !== false) {
$cutPos = $qPos;
} elseif ($hashPos !== false) {
$cutPos = $hashPos;
}
if ($cutPos !== false) {
$queryString = substr($jpegUrl, (int) $cutPos);
$jpegUrlNoQuery = substr($jpegUrl, 0, (int) $cutPos);
}

if (!preg_match('/\.(jpe?g|JPE?G)$/', $jpegUrlNoQuery)) {
return null;
}

$avifNoQuery = preg_replace('/\.(jpe?g|JPE?G)$/i', '.avif', $jpegUrlNoQuery);
$relative = str_replace($this->uploadsInfo['baseurl'] ?? '', '', (string) $avifNoQuery);
$avifLocal = ($this->uploadsInfo['basedir'] ?? '') . $relative;
return $this->avifExists($avifLocal) ? $avifUrl : null;
if (!$this->avifExists($avifLocal)) {
return null;
}

return $avifNoQuery . $queryString;
}

private function isUploadsImage(string $src): bool
Expand Down