Merge pull request #11882 from eileenmcnaughton/report_filter

Fix report form isTableSelected to treat relative date filters as filters
civicrm · Mar 28, 2018 · 7aed41f · 7aed41f
2 parents 778e350 + 3d8f552
commit 7aed41f
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
@@ -3996,10 +3996,11 @@ public function selectedTables() {
         }
         if (array_key_exists('filters', $table)) {
           foreach ($table['filters'] as $filterName => $filter) {
-            if (!empty($this->_params["{$filterName}_value"]) ||
-              CRM_Utils_Array::value("{$filterName}_op", $this->_params) ==
-              'nll' ||
-              CRM_Utils_Array::value("{$filterName}_op", $this->_params) ==
+            if (!empty($this->_params["{$filterName}_value"])
+              || !empty($this->_params["{$filterName}_relative"])
+              || CRM_Utils_Array::value("{$filterName}_op", $this->_params) ==
+              'nll'
+              || CRM_Utils_Array::value("{$filterName}_op", $this->_params) ==
               'nnll'
             ) {
               $this->_selectedTables[] = $tableName;