From f5c4d1132c6e628b8d07ab29e393324b24edcf35 Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Tue, 9 Dec 2014 08:13:24 +0200
Subject: [PATCH] Made hierarchicalFacetHelper optional in the constructor of
SideFacets. Fixes at least FavoriteFacets.
---
module/VuFind/src/VuFind/Recommend/SideFacets.php | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/module/VuFind/src/VuFind/Recommend/SideFacets.php b/module/VuFind/src/VuFind/Recommend/SideFacets.php
index 80058d984f4..d1bd2b01741 100644
--- a/module/VuFind/src/VuFind/Recommend/SideFacets.php
+++ b/module/VuFind/src/VuFind/Recommend/SideFacets.php
@@ -121,7 +121,7 @@ class SideFacets extends AbstractFacets
*/
public function __construct(
\VuFind\Config\PluginManager $configLoader,
- HierarchicalFacetHelper $facetHelper
+ HierarchicalFacetHelper $facetHelper = null
) {
$this->configLoader = $configLoader;
$this->hierarchicalFacetHelper = $facetHelper;
@@ -232,6 +232,7 @@ class SideFacets extends AbstractFacets
* Get facet information from the search results.
*
* @return array
+ * @throws \Exception
*/
public function getFacetSet()
{
@@ -239,6 +240,12 @@ class SideFacets extends AbstractFacets
foreach ($this->hierarchicalFacets as $hierarchicalFacet) {
if (isset($facetSet[$hierarchicalFacet])) {
+ if (!$this->hierarchicalFacetHelper) {
+ throw new \Exception(
+ get_class($this). ': hierarchical facet helper unavailable'
+ );
+ }
+
$facetArray = $this->hierarchicalFacetHelper->buildFacetArray(
$hierarchicalFacet, $facetSet[$hierarchicalFacet]['list']
);
--
GitLab