From 30898ee84036c6b5d9e0aa23266d4f37fd1f40d9 Mon Sep 17 00:00:00 2001 From: eileen Date: Wed, 5 Jun 2019 12:24:08 +1200 Subject: [PATCH] Fix upgrade on participant_register date On testing I found the conversion routing on participant register date wasn't working properly when upgrading to 5.15 - this fixes --- CRM/Upgrade/Incremental/SmartGroups.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CRM/Upgrade/Incremental/SmartGroups.php b/CRM/Upgrade/Incremental/SmartGroups.php index 64c5ab9dc0..a92aa9e649 100644 --- a/CRM/Upgrade/Incremental/SmartGroups.php +++ b/CRM/Upgrade/Incremental/SmartGroups.php @@ -54,7 +54,10 @@ class CRM_Upgrade_Incremental_SmartGroups { $fieldPossibilities[] = $field . '_high'; $fieldPossibilities[] = $field . '_low'; } - $relativeDateMappings = ['activity_date_time' => 'activity']; + $relativeDateMappings = [ + 'activity_date_time' => 'activity', + 'participant_register_date' => 'participant', + ]; foreach ($fields as $field) { foreach ($this->getSearchesWithField($field) as $savedSearch) { @@ -74,7 +77,10 @@ class CRM_Upgrade_Incremental_SmartGroups { // Any actual criteria will have this key set but skip any weird lines continue; } - if (in_array($formValue[0], $fieldPossibilities)) { + if ($formValue[0] === $relativeFieldName && empty($formValue[2])) { + unset($formValues[$index]);; + } + elseif (in_array($formValue[0], $fieldPossibilities)) { if ($isRelative) { unset($formValues[$index]); } -- 2.25.1