From: Pratik Joshi <pratik.joshi@webaccess.co.in>
Date: Wed, 21 May 2014 13:47:28 +0000 (+0530)
Subject: CRM-14317-comment-fix
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9e49a7b891cb6fcceb0cf63145393508835f9eb5;p=civicrm-core.git

CRM-14317-comment-fix
---

diff --git a/CRM/Export/BAO/Export.php b/CRM/Export/BAO/Export.php
index 3e50de0669..8930ebe469 100644
--- a/CRM/Export/BAO/Export.php
+++ b/CRM/Export/BAO/Export.php
@@ -380,6 +380,12 @@ INSERT INTO {$componentTable} SELECT distinct gc.contact_id FROM civicrm_group_c
       }
     }
 
+    // rectify params to what proximity search expects if there is a value for prox_distance
+    // CRM-7021
+    if (!empty($params)) {
+      CRM_Contact_BAO_ProximityQuery::fixInputParams($params);
+    }
+
     $query = new CRM_Contact_BAO_Query($params, $returnProperties, NULL,
       FALSE, FALSE, $queryMode,
       FALSE, TRUE, TRUE, NULL, $queryOperator