fix issues when the dam image urls tags don't have width/height by us…

…ing the width/height arguments when present
Codeinwp · Jan 10, 2025 · 139c42e · 139c42e
1 parent 65a87ae
commit 139c42e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/inc/app_replacer.php b/inc/app_replacer.php
@@ -612,6 +612,15 @@ protected function parse_dimensions_from_filename( $src ) {
 			if ( $width && $height ) {
 				return [ $width, $height, $crop ];
 			}
+		} else {
+			$optimized_args = $this->parse_dimension_from_optimized_url( $src );
+			if ( $optimized_args[0] !== 'auto' && $optimized_args[1] !== 'auto' ) {
+				return [
+					$optimized_args[0] !== 'auto' ? (int) $optimized_args[0] : false,
+					$optimized_args[1] !== 'auto' ? (int) $optimized_args[1] : false,
+					false,
+				];
+			}
 		}
 
 		return [ false, false, false ];

diff --git a/inc/tag_replacer.php b/inc/tag_replacer.php
@@ -9,6 +9,7 @@
 final class Optml_Tag_Replacer extends Optml_App_Replacer {
 	use Optml_Normalizer;
 	use Optml_Validator;
+	use Optml_Dam_Offload_Utils;
 
 	/**
 	 * Cached object instance.

diff --git a/tests/test-lazyload.php b/tests/test-lazyload.php
@@ -25,6 +25,7 @@ class Test_Lazyload extends WP_UnitTestCase {
 	<img src="http://example.org/wp-content/optimole-wp/assets/img/logo5.gif">
 	 ';
 	const DAM_IMG_TAG = '<img width="100" height="200" src="https://cloudUrlTest.test/dam:1/w:auto/h:auto/q:auto/id:b1b12ee03bf3945d9d9bb963ce79cd4f/https://test-site.test/9.jpg">';
+	const DAM_IMG_TAG_NO_WIDTH = '<img src="https://cloudUrlTest.test/w:200/h:300/process:20202/q:auto/id:b1b12ee03bf3945d9d9bb963ce79cd4f/https://test-site.test/9.jpg">';
 	public function setUp() : void {
 		parent::setUp();
 		$settings = new Optml_Settings();
@@ -575,4 +576,13 @@ public function test_dam_lazyloading() {
 
 		$this->assertStringContainsString( 'data-opt-src="https://cloudUrlTest.test/w:100/h:200/rt:fill/g:ce/ig:avif/q:mauto/id:b1b12ee03bf3945d9d9bb963ce79cd4f/https://test-site.test/9.jpg"', $replaced_content );
 	}
+	public function test_dam_lazyloading_no_wh_attributes() {
+		add_filter('optml_lazyload_images_skip','__return_zero');
+		Optml_Manager::instance()->lazyload_replacer->settings->update('lazyload_placeholder','enabled');
+		Optml_Manager::instance()->lazyload_replacer->init();
+		$replaced_content = Optml_Manager::instance()->process_images_from_content( self::DAM_IMG_TAG_NO_WIDTH );
+		$svg = Optml_Manager::instance()->lazyload_replacer->get_svg_for( 200, 300, 'http://example.org/testimage.png' );
+		$this->assertStringContainsString( $svg, $replaced_content );
+		remove_filter('optml_lazyload_images_skip','__return_zero');
+	}
 }