From b841f9e31895b3ee9c2c00d6bcab4a7c89e715d0 Mon Sep 17 00:00:00 2001
From: Chris Burgess <chris@giantrobot.co.nz>
Date: Wed, 15 Feb 2017 19:41:47 +1300
Subject: [PATCH] CRM-20023: Do not require state_province value before
 resolving state_province_id.

---
 CRM/Utils/Geocode/Google.php | 2 +-
 CRM/Utils/Geocode/Yahoo.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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']);
       }
-- 
2.25.1