CRM-12368

----------------------------------------
* CRM-12368: proximity search via advanced search broken
  http://issues.civicrm.org/jira/browse/CRM-12368

diff --git a/CRM/Contact/BAO/ProximityQuery.php b/CRM/Contact/BAO/ProximityQuery.php
index 1340c5e91ee2a74e12673a02d8427af9516e56a5..19b58250d78b3cc3e11b43edbed847a51e8a9af4 100644 (file)
--- a/CRM/Contact/BAO/ProximityQuery.php
+++ b/CRM/Contact/BAO/ProximityQuery.php
@@ -296,7 +296,7 @@ $earthDistanceSQL  <= $distance
       if (isset($proximityAddress['state_province_id'])) {
         $proximityAddress['country_id'] = CRM_Core_PseudoConstant::countryForState($proximityAddress['state_province_id']);
       }
-      else {
+      elseif (isset($config->defaultContactCountry)) {
         $proximityAddress['country_id'] = $config->defaultContactCountry;
       }
     }