diff --git a/CHANGELOG.md b/CHANGELOG.md index a2053df7b0b8411d325685877429391f5590eb75..252641ed79f84abb99bdc224793e9482cce837cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ -# Version 1.25 (not yet released) +# Version 1.24.1 + +* Fixed regression bug when only one activity data source is present. # Version 1.24 diff --git a/Civi/DataProcessor/ProcessorType/AbstractProcessorType.php b/Civi/DataProcessor/ProcessorType/AbstractProcessorType.php index a195391e79e9b67cf02df8d3e6f79ba6fb8b6884..45feb280cd3e703d37083192f0b478fbc485495d 100644 --- a/Civi/DataProcessor/ProcessorType/AbstractProcessorType.php +++ b/Civi/DataProcessor/ProcessorType/AbstractProcessorType.php @@ -155,20 +155,15 @@ abstract class AbstractProcessorType { */ public function getDataFlow() { if (!$this->dataflow) { - if (count($this->dataSources) === 1) { - $dataflow = $this->dataSources[0]['datasource']->getDataFlow(); + if ($this->allSqlDataFlows) { + $dataflow = new CombinedSqlDataFlow(); } else { - if ($this->allSqlDataFlows) { - $dataflow = new CombinedSqlDataFlow(); - } - else { - $dataflow = new CombinedDataFlow(); - } - foreach ($this->dataSources as $datasource) { - $dataFlowDescription = new DataFlowDescription($datasource['datasource']->getDataFlow(), $datasource['combine_specification']); - $dataflow->addSourceDataFlow($dataFlowDescription); - } + $dataflow = new CombinedDataFlow(); + } + foreach ($this->dataSources as $datasource) { + $dataFlowDescription = new DataFlowDescription($datasource['datasource']->getDataFlow(), $datasource['combine_specification']); + $dataflow->addSourceDataFlow($dataFlowDescription); } if ($this->storage) { diff --git a/info.xml b/info.xml index 89cca4093b462ac6509247ac4e7c1afa0837b338..4cb2c156a2d2b6a2bf7c8fd212c1976bb7d060f7 100644 --- a/info.xml +++ b/info.xml @@ -15,7 +15,7 @@ <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> <releaseDate>2020-12-11</releaseDate> - <version>1.25-dev</version> + <version>1.24.1</version> <develStage>stable</develStage> <compatibility> <ver>4.7</ver>