Merge pull request #9952 from JMAConsulting/CRM-20025

CRM-20025 [ready for review] Prevented query from fetching contacts without contributions
civicrm · Mar 10, 2017 · d4033f9 · d4033f9
2 parents 9a9258a + 593e0d0
commit d4033f9
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/CRM/Contribute/Form/Task.php b/CRM/Contribute/Form/Task.php
@@ -115,6 +115,22 @@ public static function preProcessCommon(&$form, $useTable = FALSE) {
     }
     else {
       $queryParams = $form->get('queryParams');
+      $isTest = FALSE;
+      foreach ($queryParams as $fields) {
+        if ($fields[0] == 'contribution_test') {
+          $isTest = TRUE;
+          break;
+        }
+      }
+      if (!$isTest) {
+        $queryParams[] = array(
+          'contribution_test',
+          '=',
+          0,
+          0,
+          0,
+        );
+      }
       $returnProperties = array('contribution_id' => 1);
       $sortOrder = $sortCol = NULL;
       if ($form->get(CRM_Utils_Sort::SORT_ORDER)) {