From d35b1eb33bc1d8f79b690246b8ee67b4d2cc3095 Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Mon, 14 Sep 2020 14:56:02 +0300
Subject: [PATCH] Output nonce properly from asset pipeline.
---
module/VuFindTheme/src/VuFindTheme/View/Helper/ConcatTrait.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/module/VuFindTheme/src/VuFindTheme/View/Helper/ConcatTrait.php b/module/VuFindTheme/src/VuFindTheme/View/Helper/ConcatTrait.php
index 80cefc32938..3566adf1a77 100644
--- a/module/VuFindTheme/src/VuFindTheme/View/Helper/ConcatTrait.php
+++ b/module/VuFindTheme/src/VuFindTheme/View/Helper/ConcatTrait.php
@@ -76,7 +76,7 @@ trait ConcatTrait
* @param stdClass $item Element object
* @param string $path New path string
*
- * @return void
+ * @return stdClass
*/
abstract protected function setResourceFilePath($item, $path);
@@ -364,6 +364,7 @@ trait ConcatTrait
// files, which are stored in a theme-independent cache).
$path = $this->getConcatenatedFilePath($group);
$item = $this->setResourceFilePath($group['items'][0], $path);
+ $item->attributes['nonce'] = $this->cspNonce;
$output[] = parent::itemToString(
$item, $indent, $escapeStart, $escapeEnd
);
--
GitLab