Merge pull request #3239 from sbwalker/dev

fix #3235 - </script> not being removed from Head Content
oqtane · Sep 8, 2023 · c0991df · c0991df
2 parents a1e5912 + 26921c8
commit c0991df
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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;