From bed76332c835c0eaf74fe293478f051f6f95a942 Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Fri, 14 Dec 2018 19:58:49 +0200
Subject: [PATCH] Take any conditions into account when grouping stylesheets
for concat. (#1286)
---
module/VuFindTheme/src/VuFindTheme/View/Helper/HeadLink.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/module/VuFindTheme/src/VuFindTheme/View/Helper/HeadLink.php b/module/VuFindTheme/src/VuFindTheme/View/Helper/HeadLink.php
index 60168d4d6dc..e11cfa4d0f0 100644
--- a/module/VuFindTheme/src/VuFindTheme/View/Helper/HeadLink.php
+++ b/module/VuFindTheme/src/VuFindTheme/View/Helper/HeadLink.php
@@ -193,7 +193,11 @@ class HeadLink extends \Zend\View\Helper\HeadLink
*/
public function getType($item)
{
- return isset($item->media) ? $item->media : 'all';
+ $type = $item->media ?? 'all';
+ if (isset($item->conditionalStylesheet)) {
+ $type .= '_' . $item->conditionalStylesheet;
+ }
+ return $type;
}
/**
--
GitLab