Fix handling of nonce to not mess with HeadLink items.

module/VuFindTheme/src/VuFindTheme/View/Helper/ConcatTrait.php

@@ -87,6 +87,20 @@ trait ConcatTrait
      */
     abstract protected function getMinifier();
 
+    /**
+     * Add a content security policy nonce to the item
+     *
+     * @param stdClass $item Item
+     *
+     * @return void
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    protected function addNonce($item)
+    {
+        // Default implementation does nothing
+    }
+
     /**
      * Set the file path of the link object
      *
@@ -364,7 +378,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;
+                $this->addNonce($item);
                 $output[] = parent::itemToString(
                     $item, $indent, $escapeStart, $escapeEnd
                 );

module/VuFindTheme/src/VuFindTheme/View/Helper/HeadLink.php

@@ -105,7 +105,7 @@ class HeadLink extends \Laminas\View\Helper\HeadLink
             $url .= filemtime($details['path']);
             $item->href = $url;
         }
-        $item->attributes['nonce'] = $this->cspNonce;
+        $this->addNonce($item);
         return parent::itemToString($item);
     }
 

module/VuFindTheme/src/VuFindTheme/View/Helper/HeadScript.php

@@ -113,7 +113,7 @@ class HeadScript extends \Laminas\View\Helper\HeadScript
             }
         }
 
-        $item->attributes['nonce'] = $this->cspNonce;
+        $this->addNonce($item);
         return parent::itemToString($item, $indent, $escapeStart, $escapeEnd);
     }
 
@@ -216,4 +216,16 @@ class HeadScript extends \Laminas\View\Helper\HeadScript
         }
         return $data;
     }
+
+    /**
+     * Add a nonce to the item
+     *
+     * @param stdClass $item Item
+     *
+     * @return void
+     */
+    protected function addNonce($item)
+    {
+        $item->attributes['nonce'] = $this->cspNonce;
+    }
 }