From b06ca616d08b1e069aa015e162a7fa7ab94ee4ed Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 3 Dec 2018 16:02:57 +1300
Subject: [PATCH] Add world region to exportable fields

---
 CRM/Core/BAO/Address.php    | 2 +-
 CRM/Core/DAO/Country.php    | 4 ++--
 xml/schema/Core/Country.xml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CRM/Core/BAO/Address.php b/CRM/Core/BAO/Address.php
index a49737ad30..226c6acff5 100644
--- a/CRM/Core/BAO/Address.php
+++ b/CRM/Core/BAO/Address.php
@@ -1349,7 +1349,7 @@ SELECT is_primary,
       case 'world_region':
       case 'worldregion':
       case 'worldregion_id':
-        return CRM_Core_BAO_Country::buildOptions('region_id', $context);
+        return CRM_Core_BAO_Country::buildOptions('region_id', $context, $props);
     }
     return CRM_Core_PseudoConstant::get(__CLASS__, $fieldName, $params, $context);
   }
diff --git a/CRM/Core/DAO/Country.php b/CRM/Core/DAO/Country.php
index 5f31cab89b..6f3d5d1e8e 100644
--- a/CRM/Core/DAO/Country.php
+++ b/CRM/Core/DAO/Country.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Country.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:467cb92fabf3d936d330591eec94504d)
+ * (GenCodeChecksum:a7e07335fea6b1eea5894c119eaa1c4e)
  */
 
 /**
@@ -213,7 +213,7 @@ class CRM_Core_DAO_Country extends CRM_Core_DAO {
         'region_id' => [
           'name' => 'region_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Region'),
+          'title' => ts('World Region ID'),
           'description' => ts('Foreign key to civicrm_worldregion.id.'),
           'required' => TRUE,
           'table_name' => 'civicrm_country',
diff --git a/xml/schema/Core/Country.xml b/xml/schema/Core/Country.xml
index e01d95511e..cae1255812 100644
--- a/xml/schema/Core/Country.xml
+++ b/xml/schema/Core/Country.xml
@@ -75,7 +75,7 @@
   </field>
   <field>
     <name>region_id</name>
-    <title>Region</title>
+    <title>World Region ID</title>
     <type>int unsigned</type>
     <required>true</required>
     <comment>Foreign key to civicrm_worldregion.id.</comment>
-- 
2.25.1