From 26921c899e70b77f379af942faf575bfb8514a15 Mon Sep 17 00:00:00 2001
From: sbwalker <shaun.walker@siliqon.com>
Date: Fri, 8 Sep 2023 11:09:07 -0400
Subject: [PATCH] fix #3235 - </script> not being removed from Head Content

---
 Oqtane.Client/UI/ThemeBuilder.razor |  2 +-
 Oqtane.Server/Pages/_Host.cshtml.cs | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Oqtane.Client/UI/ThemeBuilder.razor b/Oqtane.Client/UI/ThemeBuilder.razor
index 769add2e8..f32c09825 100644
--- a/Oqtane.Client/UI/ThemeBuilder.razor
+++ b/Oqtane.Client/UI/ThemeBuilder.razor
@@ -72,7 +72,7 @@
             while (index >= 0)
             {
                 var element = content.Substring(index, content.IndexOf(">", index) - index + 1);
-                if (!string.IsNullOrEmpty(element) && !element.ToLower().StartsWith("<script"))
+                if (!string.IsNullOrEmpty(element) && !element.ToLower().StartsWith("<script") && !element.ToLower().StartsWith("</script"))
                 {
                     if (!headcontent.Contains(element))
                     {
diff --git a/Oqtane.Server/Pages/_Host.cshtml.cs b/Oqtane.Server/Pages/_Host.cshtml.cs
index ddee53c84..8ddf81a8e 100644
--- a/Oqtane.Server/Pages/_Host.cshtml.cs
+++ b/Oqtane.Server/Pages/_Host.cshtml.cs
@@ -437,17 +437,17 @@ private string CreateReconnectScript()
             "</script>";
         }
 
-        private string ParseScripts(string headcontent)
+        private string ParseScripts(string content)
         {
             // iterate scripts
             var scripts = "";
-            if (!string.IsNullOrEmpty(headcontent))
+            if (!string.IsNullOrEmpty(content))
             {
-                var index = headcontent.IndexOf("<script");
+                var index = content.IndexOf("<script");
                 while (index >= 0)
                 {
-                    scripts += headcontent.Substring(index, headcontent.IndexOf("</script>", index) + 9 - index);
-                    index = headcontent.IndexOf("<script", index + 1);
+                    scripts += content.Substring(index, content.IndexOf("</script>", index) + 9 - index);
+                    index = content.IndexOf("<script", index + 1);
                 }
             }
             return scripts;