diff options
author | dizzy <diosmosis@users.noreply.github.com> | 2021-06-09 07:42:44 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-09 07:42:44 +0300 |
commit | 36e83dc533562fca2128ce2460e4c51d96b46a70 (patch) | |
tree | ac5b2304a4b03d18618929b546477b3d829c7d9e /plugins/API | |
parent | d1291268de74142c168a9dcca2e8bb0916150138 (diff) |
if table is falsey use null in compareTables() (#17642)
Diffstat (limited to 'plugins/API')
-rw-r--r-- | plugins/API/Filter/DataComparisonFilter.php | 2 | ||||
-rw-r--r-- | plugins/API/Filter/DataComparisonFilter/ComparisonRowGenerator.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/API/Filter/DataComparisonFilter.php b/plugins/API/Filter/DataComparisonFilter.php index 17bec4430d..2a39c607e9 100644 --- a/plugins/API/Filter/DataComparisonFilter.php +++ b/plugins/API/Filter/DataComparisonFilter.php @@ -221,7 +221,7 @@ class DataComparisonFilter $comparisonSeries[] = $compareMetadata['compareSeriesPretty']; $compareTable = $this->requestReport($method, $modifiedParams); - $this->comparisonRowGenerator->compareTables($compareMetadata, $table, $compareTable); + $this->comparisonRowGenerator->compareTables($compareMetadata, $table, empty($compareTable) ? null : $compareTable); } // calculate changes (including processed metric changes) diff --git a/plugins/API/Filter/DataComparisonFilter/ComparisonRowGenerator.php b/plugins/API/Filter/DataComparisonFilter/ComparisonRowGenerator.php index da6d5eff75..446eb6cd59 100644 --- a/plugins/API/Filter/DataComparisonFilter/ComparisonRowGenerator.php +++ b/plugins/API/Filter/DataComparisonFilter/ComparisonRowGenerator.php @@ -51,7 +51,7 @@ class ComparisonRowGenerator $isDatePeriod = $tables->getKeyName() == 'date'; foreach ($childTablesArray as $index => $childTable) { - $compareChildTable = isset($compareTablesArray[$index]) ? $compareTablesArray[$index] : null; + $compareChildTable = !empty($compareTablesArray[$index]) ? $compareTablesArray[$index] : null; $this->compareTables($compareMetadata, $childTable, $compareChildTable); } @@ -82,7 +82,7 @@ class ComparisonRowGenerator $tables->addTable($newTable, $periodLabel); // compare with the empty table - $compareTable = $compareTablesArray[$i]; + $compareTable = !empty($compareTablesArray[$i]) ? $compareTablesArray[$i] : null; $this->compareTables($compareMetadata, $newTable, $compareTable); } } |