Merge pull request #949 from Codeinwp/fix/compats

selul · web-flow · commit 554a800214e5 · 2025-08-20T11:23:44.000+03:00
Fix/compats
diff --git a/inc/compatibilities/beaver_builder.php b/inc/compatibilities/beaver_builder.php
@@ -32,7 +32,18 @@ function ( $all_watchers ) {
 				return $all_watchers;
 			}
 		);
-		add_filter( 'fl_builder_render_css', [ Optml_Main::instance()->manager, 'replace_content' ], PHP_INT_MAX, 1 );
-		add_filter( 'fl_builder_render_js', [ Optml_Main::instance()->manager, 'replace_content' ], PHP_INT_MAX, 1 );
+		add_filter( 'fl_builder_render_css', [ $this, 'replace_static_content' ], PHP_INT_MAX, 1 );
+		add_filter( 'fl_builder_render_js', [ $this, 'replace_static_content' ], PHP_INT_MAX, 1 );
+	}
+
+	/**
+	 * Replace urls in static content.
+	 *
+	 * @param string $content Content to replace.
+	 *
+	 * @return string Altered content.
+	 */
+	public function replace_static_content( $content ) {
+		return Optml_Main::instance()->manager->replace_content( $content, true );
 	}
 }
diff --git a/inc/compatibilities/divi_builder.php b/inc/compatibilities/divi_builder.php
@@ -56,7 +56,7 @@ public function optimize_divi_static_files( $page_resource ) {
 				$data = $page_resource->get_data( 'file' );
 
 				if ( ! empty( $data ) ) {
-					$data = Optml_Main::instance()->manager->replace_content( $data );
+					$data = Optml_Main::instance()->manager->replace_content( $data, true );
 					ET_Core_PageResource::$wpfs->put_contents( $page_resource->path, $data, 0644 );
 				}
 			}
diff --git a/inc/compatibilities/elementor_builder_late.php b/inc/compatibilities/elementor_builder_late.php
@@ -48,7 +48,7 @@ public function replace_meta( $metadata, $object_id, $meta_key, $single ) {
 				return $metadata;
 			}
 
-			return Optml_Main::instance()->manager->replace_content( $current_meta );
+			return Optml_Main::instance()->manager->replace_content( $current_meta, true );
 		}
 
 		// Return original if the check does not pass
diff --git a/inc/compatibilities/facetwp.php b/inc/compatibilities/facetwp.php
@@ -39,7 +39,7 @@ public function api_replacement_filter( $output, $data ) {
 		$output = json_decode( $output );
 
 		if ( isset( $output->template ) ) {
-			$output->template = Optml_Main::instance()->manager->replace_content( $output->template );
+			$output->template = Optml_Main::instance()->manager->replace_content( $output->template, true );
 		}
 
 		// Ignore invalid UTF-8 characters in PHP 7.2+
@@ -48,7 +48,7 @@ public function api_replacement_filter( $output, $data ) {
 		} else {
 			$output = json_encode( $output, JSON_INVALID_UTF8_IGNORE );
 		}
-		$output = Optml_Main::instance()->manager->replace_content( $output );
+		$output = Optml_Main::instance()->manager->replace_content( $output, true );
 		return $output;
 	}
 	/**
@@ -65,7 +65,7 @@ public function api_replacement_action( $output ) {
 		if ( ! isset( $output['template'] ) || ! function_exists( 'FWP' ) ) {
 			return;
 		}
-		$output['template'] = Optml_Main::instance()->manager->replace_content( $output['template'] );
+		$output['template'] = Optml_Main::instance()->manager->replace_content( $output['template'], true );
 		FWP()->request->output = $output;
 	}
 	/**
diff --git a/inc/compatibilities/yith_quick_view.php b/inc/compatibilities/yith_quick_view.php
@@ -23,7 +23,12 @@ public function should_load() {
 	 */
 	public function register() {
 		Optml_Url_Replacer::instance()->init();
-		add_filter( 'woocommerce_single_product_image_thumbnail_html', [ Optml_Main::instance()->manager, 'replace_content' ] );
+		add_filter(
+			'woocommerce_single_product_image_thumbnail_html',
+			function ( $html ) {
+				return Optml_Main::instance()->manager->replace_content( $html, true );
+			}
+		);
 	}
 
 	/**
diff --git a/inc/manager.php b/inc/manager.php
@@ -409,15 +409,16 @@ public function register_after_setup() {
 	 * Filter raw HTML content for urls.
 	 *
 	 * @param string $html HTML to filter.
+	 * @param bool   $partial If this is a partial content replacement and not a full page. It matters when we are are doing full page optimization like viewport lazyload.
 	 *
 	 * @return mixed Filtered content.
 	 */
-	public function replace_content( $html ) {
+	public function replace_content( $html, $partial = false ) {
 
 		if ( defined( 'REST_REQUEST' ) && REST_REQUEST && is_user_logged_in() && ( apply_filters( 'optml_force_replacement', false ) !== true ) ) {
 			return $html;
 		}
-		if ( $this->settings->is_lazyload_type_viewport() ) {
+		if ( $this->settings->is_lazyload_type_viewport() && ! $partial ) {
 			$profile_id = Profile::generate_id( $html );
 			// We disable the optimizer for logged in users.
 			if ( ! is_user_logged_in() || ! apply_filters( 'optml_force_page_profiler', false ) !== true ) {
@@ -442,7 +443,9 @@ public function replace_content( $html ) {
 			Profile::set_current_profile_id( $profile_id );
 			$this->page_profiler->set_current_profile_data();
 		}
-		$html = $this->add_html_class( $html );
+		if ( ! $partial ) {
+			$html = $this->add_html_class( $html );
+		}
 
 		$html = $this->process_images_from_content( $html );
 
@@ -457,7 +460,7 @@ public function replace_content( $html ) {
 			}
 		}
 
-		if ( $this->settings->is_lazyload_type_viewport() ) {
+		if ( $this->settings->is_lazyload_type_viewport() && ! $partial ) {
 			$personalized_bg_css = Lazyload::get_current_personalized_css();
 			if ( OPTML_DEBUG ) {
 				do_action( 'optml_log', 'viewport_bgselectorsdata: ' . print_r( $personalized_bg_css, true ) );
@@ -475,22 +478,24 @@ public function replace_content( $html ) {
 				}
 			}
 		}
-		// WE need this last since during bg personalized CSS we collect preload urls
-		if ( Links::get_links_count() > 0 ) {
-			if ( OPTML_DEBUG ) {
-				do_action( 'optml_log', 'preload_links: ' . print_r( Links::get_links(), true ) );
+		if ( ! $partial ) {
+			// WE need this last since during bg personalized CSS we collect preload urls
+			if ( Links::get_links_count() > 0 ) {
+				if ( OPTML_DEBUG ) {
+					do_action( 'optml_log', 'preload_links: ' . print_r( Links::get_links(), true ) );
+				}
+				$html = str_replace( Optml_Admin::get_preload_links_placeholder(), Links::get_links_html(), $html );
+			} else {
+				$html = str_replace( Optml_Admin::get_preload_links_placeholder(), '', $html );
 			}
-			$html = str_replace( Optml_Admin::get_preload_links_placeholder(), Links::get_links_html(), $html );
-		} else {
-			$html = str_replace( Optml_Admin::get_preload_links_placeholder(), '', $html );
 		}
 
 		$html = apply_filters( 'optml_url_pre_process', $html );
 
 		$html = $this->process_urls_from_content( $html );
 
 		$html = apply_filters( 'optml_url_post_process', $html );
-		if ( $this->settings->is_lazyload_type_viewport() ) {
+		if ( $this->settings->is_lazyload_type_viewport() && ! $partial ) {
 			Profile::reset_current_profile();
 		}
 		return $html;

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function optimize_divi_static_files( $page_resource ) {`
`56`	`56`	`$data = $page_resource->get_data( 'file' );`
`57`	`57`
`58`	`58`	`if ( ! empty( $data ) ) {`
`59`		`- $data = Optml_Main::instance()->manager->replace_content( $data );`
	`59`	`+ $data = Optml_Main::instance()->manager->replace_content( $data, true );`
`60`	`60`	`ET_Core_PageResource::$wpfs->put_contents( $page_resource->path, $data, 0644 );`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function replace_meta( $metadata, $object_id, $meta_key, $single ) {`
`48`	`48`	`return $metadata;`
`49`	`49`	`}`
`50`	`50`
`51`		`- return Optml_Main::instance()->manager->replace_content( $current_meta );`
	`51`	`+ return Optml_Main::instance()->manager->replace_content( $current_meta, true );`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`// Return original if the check does not pass`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function api_replacement_filter( $output, $data ) {`
`39`	`39`	`$output = json_decode( $output );`
`40`	`40`
`41`	`41`	`if ( isset( $output->template ) ) {`
`42`		`- $output->template = Optml_Main::instance()->manager->replace_content( $output->template );`
	`42`	`+ $output->template = Optml_Main::instance()->manager->replace_content( $output->template, true );`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`// Ignore invalid UTF-8 characters in PHP 7.2+`
`@@ -48,7 +48,7 @@ public function api_replacement_filter( $output, $data ) {`
`48`	`48`	`} else {`
`49`	`49`	`$output = json_encode( $output, JSON_INVALID_UTF8_IGNORE );`
`50`	`50`	`}`
`51`		`- $output = Optml_Main::instance()->manager->replace_content( $output );`
	`51`	`+ $output = Optml_Main::instance()->manager->replace_content( $output, true );`
`52`	`52`	`return $output;`
`53`	`53`	`}`
`54`	`54`	`/**`
`@@ -65,7 +65,7 @@ public function api_replacement_action( $output ) {`
`65`	`65`	`if ( ! isset( $output['template'] ) \|\| ! function_exists( 'FWP' ) ) {`
`66`	`66`	`return;`
`67`	`67`	`}`
`68`		`- $output['template'] = Optml_Main::instance()->manager->replace_content( $output['template'] );`
	`68`	`+ $output['template'] = Optml_Main::instance()->manager->replace_content( $output['template'], true );`
`69`	`69`	`FWP()->request->output = $output;`
`70`	`70`	`}`
`71`	`71`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -409,15 +409,16 @@ public function register_after_setup() {`
`409`	`409`	`* Filter raw HTML content for urls.`
`410`	`410`	`*`
`411`	`411`	`* @param string $html HTML to filter.`
	`412`	`+ * @param bool $partial If this is a partial content replacement and not a full page. It matters when we are are doing full page optimization like viewport lazyload.`
`412`	`413`	`*`
`413`	`414`	`* @return mixed Filtered content.`
`414`	`415`	`*/`
`415`		`- public function replace_content( $html ) {`
	`416`	`+ public function replace_content( $html, $partial = false ) {`
`416`	`417`
`417`	`418`	`if ( defined( 'REST_REQUEST' ) && REST_REQUEST && is_user_logged_in() && ( apply_filters( 'optml_force_replacement', false ) !== true ) ) {`
`418`	`419`	`return $html;`
`419`	`420`	`}`
`420`		`- if ( $this->settings->is_lazyload_type_viewport() ) {`
	`421`	`+ if ( $this->settings->is_lazyload_type_viewport() && ! $partial ) {`
`421`	`422`	`$profile_id = Profile::generate_id( $html );`
`422`	`423`	`// We disable the optimizer for logged in users.`
`423`	`424`	`if ( ! is_user_logged_in() \|\| ! apply_filters( 'optml_force_page_profiler', false ) !== true ) {`
`@@ -442,7 +443,9 @@ public function replace_content( $html ) {`
`442`	`443`	`Profile::set_current_profile_id( $profile_id );`
`443`	`444`	`$this->page_profiler->set_current_profile_data();`
`444`	`445`	`}`
`445`		`- $html = $this->add_html_class( $html );`
	`446`	`+ if ( ! $partial ) {`
	`447`	`+ $html = $this->add_html_class( $html );`
	`448`	`+ }`
`446`	`449`
`447`	`450`	`$html = $this->process_images_from_content( $html );`
`448`	`451`
`@@ -457,7 +460,7 @@ public function replace_content( $html ) {`
`457`	`460`	`}`
`458`	`461`	`}`
`459`	`462`
`460`		`- if ( $this->settings->is_lazyload_type_viewport() ) {`
	`463`	`+ if ( $this->settings->is_lazyload_type_viewport() && ! $partial ) {`
`461`	`464`	`$personalized_bg_css = Lazyload::get_current_personalized_css();`
`462`	`465`	`if ( OPTML_DEBUG ) {`
`463`	`466`	`do_action( 'optml_log', 'viewport_bgselectorsdata: ' . print_r( $personalized_bg_css, true ) );`
`@@ -475,22 +478,24 @@ public function replace_content( $html ) {`
`475`	`478`	`}`
`476`	`479`	`}`
`477`	`480`	`}`
`478`		`- // WE need this last since during bg personalized CSS we collect preload urls`
`479`		`- if ( Links::get_links_count() > 0 ) {`
`480`		`- if ( OPTML_DEBUG ) {`
`481`		`- do_action( 'optml_log', 'preload_links: ' . print_r( Links::get_links(), true ) );`
	`481`	`+ if ( ! $partial ) {`
	`482`	`+ // WE need this last since during bg personalized CSS we collect preload urls`
	`483`	`+ if ( Links::get_links_count() > 0 ) {`
	`484`	`+ if ( OPTML_DEBUG ) {`
	`485`	`+ do_action( 'optml_log', 'preload_links: ' . print_r( Links::get_links(), true ) );`
	`486`	`+ }`
	`487`	`+ $html = str_replace( Optml_Admin::get_preload_links_placeholder(), Links::get_links_html(), $html );`
	`488`	`+ } else {`
	`489`	`+ $html = str_replace( Optml_Admin::get_preload_links_placeholder(), '', $html );`
`482`	`490`	`}`
`483`		`- $html = str_replace( Optml_Admin::get_preload_links_placeholder(), Links::get_links_html(), $html );`
`484`		`- } else {`
`485`		`- $html = str_replace( Optml_Admin::get_preload_links_placeholder(), '', $html );`
`486`	`491`	`}`
`487`	`492`
`488`	`493`	`$html = apply_filters( 'optml_url_pre_process', $html );`
`489`	`494`
`490`	`495`	`$html = $this->process_urls_from_content( $html );`
`491`	`496`
`492`	`497`	`$html = apply_filters( 'optml_url_post_process', $html );`
`493`		`- if ( $this->settings->is_lazyload_type_viewport() ) {`
	`498`	`+ if ( $this->settings->is_lazyload_type_viewport() && ! $partial ) {`
`494`	`499`	`Profile::reset_current_profile();`
`495`	`500`	`}`
`496`	`501`	`return $html;`