From da0577d89b5d9d891ddc20fa5be453871c688de1 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Fri, 17 Jul 2020 12:16:35 -0400 Subject: [PATCH] Ensure serialize field exists before adding to query --- CRM/Core/BAO/CustomGroup.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/CRM/Core/BAO/CustomGroup.php b/CRM/Core/BAO/CustomGroup.php index 81738e34250c..3a0dac33f161 100644 --- a/CRM/Core/BAO/CustomGroup.php +++ b/CRM/Core/BAO/CustomGroup.php @@ -108,8 +108,8 @@ public static function create(&$params) { 'is_multiple', 'icon', ]; - $current_db_version = CRM_Core_DAO::singleValueQuery("SELECT version FROM civicrm_domain WHERE id = " . CRM_Core_Config::domainID()); - $is_public_version = $current_db_version >= '4.7.19' ? 1 : 0; + $current_db_version = CRM_Core_BAO_Domain::version(); + $is_public_version = version_compare($current_db_version, '4.7.19', '>='); if ($is_public_version) { $fields[] = 'is_public'; } @@ -400,7 +400,6 @@ public static function getTree( 'time_format', 'option_group_id', 'in_selector', - 'serialize', ], 'custom_group' => [ 'id', @@ -418,11 +417,15 @@ public static function getTree( 'max_multiple', ], ]; - $current_db_version = CRM_Core_DAO::singleValueQuery("SELECT version FROM civicrm_domain WHERE id = " . CRM_Core_Config::domainID()); - $is_public_version = $current_db_version >= '4.7.19' ? 1 : 0; + $current_db_version = CRM_Core_BAO_Domain::version(); + $is_public_version = version_compare($current_db_version, '4.7.19', '>='); + $serialize_version = version_compare($current_db_version, '5.27.alpha1', '>='); if ($is_public_version) { $tableData['custom_group'][] = 'is_public'; } + if ($serialize_version) { + $tableData['custom_field'][] = 'serialize'; + } if (!$toReturn || !is_array($toReturn)) { $toReturn = $tableData; }