Skip to content
Snippets Groups Projects
Commit bc111d6d authored by Ghislain Loas's avatar Ghislain Loas Committed by Laurent
Browse files

hackfest : library widget fix fatal error

parent 6f01a3fe
Branches
Tags
3 merge requests!2080Sandbox detach zf from storm,!1940Dev#48981 3455 lier des cartes via bokeh,!1929Dev#48981 3455 lier des cartes via bokeh
......@@ -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
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment