From d23885225f947349384c23035d8aed2f67e9e3ea Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Wed, 1 Mar 2023 21:53:53 -0800 Subject: [PATCH] Worldregion - For API-entity-naming, prefer "WorldRegion" --- CRM/Core/DAO/AllCoreTables.data.php | 2 +- CRM/Core/DAO/Worldregion.php | 8 ++++---- xml/schema/Core/Worldregion.xml | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CRM/Core/DAO/AllCoreTables.data.php b/CRM/Core/DAO/AllCoreTables.data.php index 456041dd3f..e043d1c0cb 100644 --- a/CRM/Core/DAO/AllCoreTables.data.php +++ b/CRM/Core/DAO/AllCoreTables.data.php @@ -53,7 +53,7 @@ return [ 'table' => 'civicrm_translation', ], 'CRM_Core_DAO_Worldregion' => [ - 'name' => 'Worldregion', + 'name' => 'WorldRegion', 'class' => 'CRM_Core_DAO_Worldregion', 'table' => 'civicrm_worldregion', ], diff --git a/CRM/Core/DAO/Worldregion.php b/CRM/Core/DAO/Worldregion.php index 3131b0e940..375beb1d00 100644 --- a/CRM/Core/DAO/Worldregion.php +++ b/CRM/Core/DAO/Worldregion.php @@ -6,11 +6,11 @@ * * Generated from xml/schema/CRM/Core/Worldregion.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:9f82f7db4b9ea76b609244a81635d1f1) + * (GenCodeChecksum:2604f3d61e573a996ee6f5d7bf4d04dc) */ /** - * Database access object for the Worldregion entity. + * Database access object for the WorldRegion entity. */ class CRM_Core_DAO_Worldregion extends CRM_Core_DAO { const EXT = 'civicrm'; @@ -82,7 +82,7 @@ class CRM_Core_DAO_Worldregion extends CRM_Core_DAO { 'required' => TRUE, 'where' => 'civicrm_worldregion.id', 'table_name' => 'civicrm_worldregion', - 'entity' => 'Worldregion', + 'entity' => 'WorldRegion', 'bao' => 'CRM_Core_DAO_Worldregion', 'localizable' => 0, 'html' => [ @@ -101,7 +101,7 @@ class CRM_Core_DAO_Worldregion extends CRM_Core_DAO { 'where' => 'civicrm_worldregion.name', 'export' => TRUE, 'table_name' => 'civicrm_worldregion', - 'entity' => 'Worldregion', + 'entity' => 'WorldRegion', 'bao' => 'CRM_Core_DAO_Worldregion', 'localizable' => 0, 'add' => '1.8', diff --git a/xml/schema/Core/Worldregion.xml b/xml/schema/Core/Worldregion.xml index 9e2b2a9b29..f24a8cc026 100644 --- a/xml/schema/Core/Worldregion.xml +++ b/xml/schema/Core/Worldregion.xml @@ -4,6 +4,7 @@ CRM/Core Worldregion civicrm_worldregion + WorldRegion 1.8 id -- 2.25.1