fix svg handling when image meta is non-existent.

fix offload replacement for alternative domains

Author: selul

inc/tag_replacer.php

@@ -490,7 +490,10 @@ public function filter_image_downsize( $image, $attachment_id, $size ) {
 					$sizes['width']  = $image_resized[6];
 					$sizes['height'] = $image_resized[7];
 				}
-
+				// There are cases when the image meta is missing and image size is non existent, see SVG image handling.
+				if ( ! $sizes['width'] || ! $sizes['height'] ) {
+					break;
+				}
 				list( $sizes['width'], $sizes['height'] ) = image_constrain_size_for_editor( $sizes['width'], $sizes['height'], $size, 'display' );
 
 				$sizes['resize'] = $this->to_optml_crop( $image_args[ $size ]['crop'] );

inc/traits/dam_offload_utils.php

@@ -246,7 +246,24 @@ private function attachment_url_to_post_id( $url ) {
 
 			$attachment_id = attachment_url_to_postid( $scaled_url );
 		}
+		/*
+		TODO: The logic is a mess, we need to refactor at some point.
+		Websites may transition between 'www' subdomains and apex domains, potentially breaking references to hosted images. This can cause issues when attempting to match attachment IDs if images are linked using outdated domains. The logic is checking for alternative domains and consider the use of 'scaled' prefixes in image URLs for large images, which might affect ID matching.
+		*/
+		if ( $attachment_id === 0 ) {
+			if ( strpos( $url, 'www.' ) !== false ) {
+				$variant_url   = str_replace( 'www.', '', $url );
+				$attachment_id = attachment_url_to_postid( $variant_url );
+			} else {
+				$variant_url   = str_replace( '://', '://www.', $url );
+				$attachment_id = attachment_url_to_postid( $variant_url );
+			}
+			if ( $attachment_id === 0 && ! $this->is_scaled_url( $variant_url ) ) {
+				$scaled_url = $this->get_scaled_url( $variant_url );
 
+				$attachment_id = attachment_url_to_postid( $scaled_url );
+			}
+		}
 		Optml_Attachment_Cache::set_cached_attachment_id( $url, $attachment_id );
 
 		return $attachment_id;

tests/assets/sample.svg

@@ -15,7 +15,7 @@ class Test_Media extends WP_UnitTestCase {
 	const IMG_TAGS = '<!-- wp:image {"id":5,"sizeSlug":"medium"} -->
 <figure class="wp-block-image size-large"><img src="https://example.i.optimole.com/BOxmgcE-_HsxvBf4/w:300/h:200/q:90/id:b19fed3de30366eb76682becf7645c7b/sample-test.jpg" alt="" class="wp-image-1339"/></figure>
 <!-- /wp:image --> ';
-
+	use Optml_Dam_Offload_Utils;
 	public static $files = [
 		'sample-test',
 		'1PQ7p',
@@ -400,7 +400,23 @@ public function test_filter_saved_data() {
 		$this->assertStringContainsString('/wp-content/uploads', $replaced['post_content'] );
 		$this->assertStringContainsString('300x300.jpg', $replaced['post_content'] );
 	}
+	public function test_replace_alternative_domain(){
+
+
+		$url = Optml_Media_Offload::get_original_url( self::$sample_attachement );
+		$this->assertEquals( $this->attachment_url_to_post_id( $url ), self::$sample_attachement );
+		$url = str_replace('example.org', 'www.example.org', $url);
+		$this->assertEquals( $this->attachment_url_to_post_id( $url ), self::$sample_attachement );
 
+		$scaled_url = Optml_Media_Offload::get_original_url( self::$sample_attachment_scaled );
+
+		$this->assertEquals( $this->attachment_url_to_post_id( $scaled_url ), self::$sample_attachment_scaled );
+		$scaled_url = str_replace('-scaled','',$scaled_url);
+
+		$this->assertEquals( $this->attachment_url_to_post_id( $scaled_url ), self::$sample_attachment_scaled );
+		$scaled_url = str_replace('example.org', 'www.example.org', $scaled_url);
+		$this->assertEquals( $this->attachment_url_to_post_id( $scaled_url ), self::$sample_attachment_scaled );
+	}
 	public function test_replace_urls_in_editor_content() {
 		// Sample attachment:
 		$original_url = Optml_Media_Offload::get_original_url( self::$sample_attachement );

tests/test-media.php

@@ -124,6 +124,7 @@ class Test_Replacer extends WP_UnitTestCase {
 
 	public static $sample_post;
 	public static $sample_attachement;
+	public static $sample_svg;
 
 	public function setUp(): void {
 
@@ -158,6 +159,7 @@ public function setUp(): void {
 			]
 		);
 		self::$sample_attachement = self::factory()->attachment->create_upload_object( OPTML_PATH . 'assets/img/logo.png' );
+		self::$sample_svg = self::factory()->attachment->create_upload_object( OPTML_PATH . 'tests/assets/sample.svg' );
 
 	}
 
@@ -180,6 +182,12 @@ public function test_wc_json_replacement() {
 
 	}
 
+	public function test_image_svg() {
+
+		$attachement_url = wp_get_attachment_image_src( self::$sample_svg, 'thumbnail' );
+		$this->assertStringContainsString( 'w:auto/h:auto', $attachement_url[0] );
+
+	}
 	public function test_image_tags() {
 		$settings = new Optml_Settings();
 		$settings->update( 'limit_dimensions', 'disabled' );