From bc111d6dfcd5c15db6d3e2575186665ff6ff73df Mon Sep 17 00:00:00 2001
From: Ghislain Loas <ghislo@sandbox.pergame.net>
Date: Tue, 15 Nov 2016 09:57:35 +0100
Subject: [PATCH] hackfest : library widget fix fatal error
---
library/Class/FilterSettings.php | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/library/Class/FilterSettings.php b/library/Class/FilterSettings.php
index 4d561f0374e..4ade064f66d 100644
--- a/library/Class/FilterSettings.php
+++ b/library/Class/FilterSettings.php
@@ -72,8 +72,14 @@ class Class_FilterSettings extends Class_Entity {
public function getActiveFilters() {
- return array_merge($this->getDefaultFilters(),
- $this->getSelectedFilters());
+ if(!$default_filters = $this->getDefaultFilters())
+ return $this->getSelectedFilters();
+
+ if(!$selected_filters = $this->getSelectedFilters())
+ return $default_filters;
+
+ return array_merge($default_filters,
+ $selected_filters);
}
}
?>
\ No newline at end of file
--
GitLab