| @@ -21,8 +21,12 @@ | ||
| 21 | 21 | 'key' => $fieldKey, |
| 22 | 22 | 'value' => $value, |
| 23 | 23 | 'type' => $fieldDetail->typ, |
| 24 | 24 | ]; |
| 25 | + if ('advanced-datetime' === $fieldData[$fieldKey]['type']) { | |
| 26 | + // Date conditions must parse the posted value in the field's own format. | |
| 27 | + $fieldData[$fieldKey]['dateFormat'] = DateConditionComparator::advancedValueFormat(isset($fieldDetail->config) ? $fieldDetail->config : null); | |
| 28 | + } | |
| 25 | 29 | if (isset($fieldDetail->mul)) { |
| 26 | 30 | $fieldData[$fieldKey] = |
| 27 | 31 | array_merge( |
| 28 | 32 | $fieldData[$fieldKey], |
| @@ -29,8 +33,13 @@ | ||
| 29 | 33 | [ |
| 30 | 34 | 'mul' => $fieldDetail->mul, |
| 31 | 35 | ] |
| 32 | 36 | ); |
| 37 | + } | |
| 38 | + // A multiple-choice Image Select holds a list, like a checkbox; compared as one string | |
| 39 | + // only its last choice counted. | |
| 40 | + if ('image-select' === $fieldDetail->typ && isset($fieldDetail->inpType) && 'checkbox' === $fieldDetail->inpType) { | |
| 41 | + $fieldData[$fieldKey]['mul'] = true; | |
| 33 | 42 | } |
| 34 | 43 | } |
| 35 | 44 | return $fieldData; |
| 36 | 45 | } |