From: Chris Burgess <chris@giantrobot.co.nz>
Date: Wed, 15 Feb 2017 06:41:47 +0000 (+1300)
Subject: CRM-20023: Do not require state_province value before resolving state_province_id.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b841f9e31895b3ee9c2c00d6bcab4a7c89e715d0;p=civicrm-core.git

CRM-20023: Do not require state_province value before resolving state_province_id.
---

diff --git a/CRM/Utils/Geocode/Google.php b/CRM/Utils/Geocode/Google.php
index db01763639..bdb4a31a33 100644
--- a/CRM/Utils/Geocode/Google.php
+++ b/CRM/Utils/Geocode/Google.php
@@ -82,7 +82,7 @@ class CRM_Utils_Geocode_Google {
       $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
index 2300026e56..4d18690340 100644
--- a/CRM/Utils/Geocode/Yahoo.php
+++ b/CRM/Utils/Geocode/Yahoo.php
@@ -79,7 +79,7 @@ class CRM_Utils_Geocode_Yahoo {
       $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']);
       }