Fix and merge conflicts with 1.x

area17 · Dec 3, 2024 · fa9c271 · fa9c271
2 parents 99546cd + cd099ff
commit fa9c271
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/Services/Headers/CSP.php b/src/Services/Headers/CSP.php
@@ -38,7 +38,7 @@ public function addNonce(string $header): string
         $header = preg_replace($pattern, $replacement, $header) ?? '';
 
         // Add nonce
-        $search = ['script-src', 'style-src'];
+        $search = ['script-src', 'script-src-elem', 'style-src', 'style-src-elem'];
 
         foreach ($search as $value) {
             $pattern = "/($value\s)/";

diff --git a/src/Support/helpers.php b/src/Support/helpers.php
@@ -16,3 +16,10 @@ function csp_nonce(): string
         return Helpers::nonce();
     }
 }
+
+if (!function_exists('twill_csp_nonce')) {
+    function twill_csp_nonce(): string
+    {
+        return Helpers::nonce();
+    }
+}