From 7626ff89567155e3f89fc7ba379313574f9a61ce Mon Sep 17 00:00:00 2001
From: Timotei <bondastimotei@gmail.com>
Date: Mon, 15 Apr 2024 14:03:18 +0300
Subject: [PATCH 1/2] ESI - enqueued scripts/styles

---
 src/esi.cls.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/esi.cls.php b/src/esi.cls.php
index 25e724acb..b63d15bad 100644
--- a/src/esi.cls.php
+++ b/src/esi.cls.php
@@ -915,10 +915,31 @@ public function load_esi_shortcode($params)
 			$atts_ori[] = is_string($k) ? "$k='" . addslashes($v) . "'" : $v;
 		}
 
+		// Clear registered styles and scripts
+		global $wp_scripts, $wp_styles;
+		foreach($wp_styles->registered as $registered) wp_deregister_style($registered->handle);
+		foreach($wp_scripts->registered as $registered) wp_deregister_script($registered->handle);
+
 		Tag::add(Tag::TYPE_ESI . "esi.$shortcode");
 
 		// Output original shortcode final content
 		echo do_shortcode("[$shortcode " . implode(' ', $atts_ori) . ' ]');
+
+		// Add registered styles and scripts from shortcode.
+		if(count($wp_styles->registered) > 0){
+			foreach($wp_styles->registered as $style_tag){
+				if( !is_bool($style_tag->src) && !empty($style_tag->src)){
+					echo '<style rel="stylesheet" href="'.$style_tag->src.'" id="'.$style_tag->handle.'">';
+				}
+			}
+		}
+		if(count($wp_scripts->registered) > 0){
+			foreach($wp_scripts->registered as $script_tag){
+				if(!empty($script_tag->src)){
+					echo '<script src="'.$script_tag->src.'" id="'.$script_tag->handle.'"></script>';
+				}
+			}
+		}
 	}
 
 	/**

From 9a87e5a07fc99fc0cff2167efaf9ee1c0e7e9b2b Mon Sep 17 00:00:00 2001
From: Timotei <bondastimotei@gmail.com>
Date: Thu, 16 May 2024 17:36:04 +0300
Subject: [PATCH 2/2] Remove warnings

---
 src/esi.cls.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/esi.cls.php b/src/esi.cls.php
index b63d15bad..185b07cda 100644
--- a/src/esi.cls.php
+++ b/src/esi.cls.php
@@ -917,8 +917,12 @@ public function load_esi_shortcode($params)
 
 		// Clear registered styles and scripts
 		global $wp_scripts, $wp_styles;
-		foreach($wp_styles->registered as $registered) wp_deregister_style($registered->handle);
-		foreach($wp_scripts->registered as $registered) wp_deregister_script($registered->handle);
+		if($wp_scripts){
+			foreach($wp_styles->registered as $registered) wp_deregister_style($registered->handle);
+		}
+		if($wp_styles){
+			foreach($wp_scripts->registered as $registered) wp_deregister_script($registered->handle);
+		}
 
 		Tag::add(Tag::TYPE_ESI . "esi.$shortcode");