From 3b61e487399b75d0a17ac280a1d36e64ad1f8a44 Mon Sep 17 00:00:00 2001
From: Jaap Jansma <jaap.jansma@civicoop.org>
Date: Mon, 15 Jul 2019 21:19:37 +0200
Subject: [PATCH] Issue #11
---
CHANGELOG.md | 4 ++++
.../FilterHandler/AbstractFieldFilterHandler.php | 7 +++++++
2 files changed, 11 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cac43280..94ee392a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Version 1.0.2
+
+* Fixed bug #11 (Fatal error clone on non object)
+
# Version 1.0.1
Initial release.
\ No newline at end of file
diff --git a/Civi/DataProcessor/FilterHandler/AbstractFieldFilterHandler.php b/Civi/DataProcessor/FilterHandler/AbstractFieldFilterHandler.php
index b3057025..8e118988 100644
--- a/Civi/DataProcessor/FilterHandler/AbstractFieldFilterHandler.php
+++ b/Civi/DataProcessor/FilterHandler/AbstractFieldFilterHandler.php
@@ -39,6 +39,13 @@ abstract class AbstractFieldFilterHandler extends AbstractFilterHandler {
if (!$this->dataSource) {
throw new DataSourceNotFoundException(E::ts("Filter %1 requires data source '%2' which could not be found. Did you rename or deleted the data source?", array(1=>$this->title, 2=>$datasource_name)));
}
+ if (!$this->dataSource->getAvailableFilterFields()->getFieldSpecificationByName($field_name)) {
+ throw new FieldNotFoundException(E::ts("Filter %1 requires a field with the name '%2' in the data source '%3'. Did you change the data source type?", array(
+ 1 => $this->title,
+ 2 => $field_name,
+ 3 => $datasource_name
+ )));
+ }
$this->fieldSpecification = clone $this->dataSource->getAvailableFilterFields()->getFieldSpecificationByName($field_name);
if (!$this->fieldSpecification) {
throw new FieldNotFoundException(E::ts("Filter %1 requires a field with the name '%2' in the data source '%3'. Did you change the data source type?", array(
--
GitLab