Fix upgrade on participant_register date
authoreileen <emcnaughton@wikimedia.org>
Wed, 5 Jun 2019 00:24:08 +0000 (12:24 +1200)
committereileen <emcnaughton@wikimedia.org>
Wed, 5 Jun 2019 00:53:16 +0000 (12:53 +1200)
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

index 64c5ab9dc0aefeecaf328e0617b9b73f33d34839..a92aa9e649c117f43c01c798f2828ab37b585e7a 100644 (file)
@@ -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]);
             }