Try to fix merge pb

This commit is contained in:
Laurent Destailleur 2026-04-10 18:05:41 +02:00
parent e1a8f040ba
commit 5d56da3117

View file

@ -1485,10 +1485,6 @@ class ExtraFields
$parentField = '';
$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {
list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
$keyList .= ', '.$parentField;
}
if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
if (strpos($InfoFieldList[4], 'extra.') !== false) {
$keyList = 'main.'.$InfoFieldList[2].' as rowid';
@ -1496,6 +1492,14 @@ class ExtraFields
$keyList = $InfoFieldList[2].' as rowid';
}
}
if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {
list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
if (!empty($InfoFieldList[4]) && strpos($InfoFieldList[4], 'extra.') !== false) {
$keyList .= ', main.'.$parentField;
} else {
$keyList .= ', '.$parentField;
}
}
$filter_categorie = false;
if (count($InfoFieldList) > 5) {