From fbe21e74c755305b5a47eec5e9c75d91969e5502 Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Wed, 17 Dec 2014 09:19:54 +0200
Subject: [PATCH] Added missing $paramArray to
HierarchicalFacetHelper::createFacetItem().
---
.../VuFind/Search/Solr/HierarchicalFacetHelper.php | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/module/VuFind/src/VuFind/Search/Solr/HierarchicalFacetHelper.php b/module/VuFind/src/VuFind/Search/Solr/HierarchicalFacetHelper.php
index 29108a8ebd8..a5948386bc5 100644
--- a/module/VuFind/src/VuFind/Search/Solr/HierarchicalFacetHelper.php
+++ b/module/VuFind/src/VuFind/Search/Solr/HierarchicalFacetHelper.php
@@ -95,12 +95,13 @@ class HierarchicalFacetHelper
*/
public function buildFacetArray($facet, $facetList, $urlHelper = false)
{
+ // getParamArray() is expensive, so call it just once and pass it on
+ $paramArray = $urlHelper !== false ? $urlHelper->getParamArray() : null;
// Create a keyed (for conversion to hierarchical) array of facet data
$keyedList = array();
- $paramArray = $urlHelper !== false ? $urlHelper->getParamArray() : null;
foreach ($facetList as $item) {
$keyedList[$item['value']] = $this->createFacetItem(
- $facet, $item, $urlHelper
+ $facet, $item, $urlHelper, $paramArray
);
}
@@ -173,15 +174,16 @@ class HierarchicalFacetHelper
/**
* Create an item for the hierarchical facet array
*
- * @param string $facet Facet name
- * @param array $item Facet item received from Solr
- * @param UrlQueryHelper $urlHelper UrlQueryHelper for creating facet
+ * @param string $facet Facet name
+ * @param array $item Facet item received from Solr
+ * @param UrlQueryHelper $urlHelper UrlQueryHelper for creating facet
* url's
+ * @param array $paramArray URL parameters
* active children
*
* @return array Facet item
*/
- protected function createFacetItem($facet, $item, $urlHelper)
+ protected function createFacetItem($facet, $item, $urlHelper, $paramArray)
{
$href = '';
$exclude = '';
--
GitLab