Merge pull request civicrm#9839 from fuzionnz/CRM-20023-geocode_state…

…_province_id CRM-20023: Do not require state_province value to use state_province_id value.
monishdeb · Mar 9, 2017 · be424fd · be424fd
2 parents 47e83de + d82f9c0
commit be424fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CRM/Utils/Geocode/Google.php b/CRM/Utils/Geocode/Google.php
@@ -82,7 +82,7 @@ public static function format(&$values, $stateName = FALSE) {
       $add .= ',+';
     }
 
-    if (!empty($values['state_province'])) {
+    if (!empty($values['state_province']) || !empty($values['state_province_id'])) {
       if (!empty($values['state_province_id'])) {
         $stateProvince = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_StateProvince', $values['state_province_id']);
       }

diff --git a/CRM/Utils/Geocode/Yahoo.php b/CRM/Utils/Geocode/Yahoo.php
@@ -79,7 +79,7 @@ public static function format(&$values, $stateName = FALSE) {
       $whereComponents['city'] = $city;
     }
 
-    if (!empty($values['state_province'])) {
+    if (!empty($values['state_province']) || !empty($values['state_province_id'])) {
       if (!empty($values['state_province_id'])) {
         $stateProvince = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_StateProvince', $values['state_province_id']);
       }