diff --git a/core/tabularbulkexport.class.inc.php b/core/tabularbulkexport.class.inc.php index 1d1d90212..1013474f0 100644 --- a/core/tabularbulkexport.class.inc.php +++ b/core/tabularbulkexport.class.inc.php @@ -150,15 +150,18 @@ abstract class TabularBulkExport extends BulkExport // Add the reconciliation keys foreach(MetaModel::GetReconcKeys($sRemoteClass) as $sRemoteAttCode) { - $sAttCodeEx = $sAttCode.'->'.$sRemoteAttCode; - if (!array_key_exists($sAttCodeEx, $aResult)) - { - $oRemoteAttDef = MetaModel::GetAttributeDef($sRemoteClass, $sRemoteAttCode); - if ($this->IsExportableField($sRemoteClass, $sRemoteAttCode, $oRemoteAttDef)) - { - $aResult[$sAttCodeEx] = array('code' => $sAttCodeEx, 'unique_label' => $oAttDef->GetLabel().'->'.$oRemoteAttDef->GetLabel(), 'label' => MetaModel::GetLabel($sRemoteClass, $sRemoteAttCode), 'attdef' => $oRemoteAttDef); - } - } + if (!empty($sRemoteAttCode)) + { + $sAttCodeEx = $sAttCode.'->'.$sRemoteAttCode; + if (!array_key_exists($sAttCodeEx, $aResult)) + { + $oRemoteAttDef = MetaModel::GetAttributeDef($sRemoteClass, $sRemoteAttCode); + if ($this->IsExportableField($sRemoteClass, $sRemoteAttCode, $oRemoteAttDef)) + { + $aResult[$sAttCodeEx] = array('code' => $sAttCodeEx, 'unique_label' => $oAttDef->GetLabel().'->'.$oRemoteAttDef->GetLabel(), 'label' => MetaModel::GetLabel($sRemoteClass, $sRemoteAttCode), 'attdef' => $oRemoteAttDef); + } + } + } } break; diff --git a/setup/compiler.class.inc.php b/setup/compiler.class.inc.php index 7d6c36a85..39f147c48 100644 --- a/setup/compiler.class.inc.php +++ b/setup/compiler.class.inc.php @@ -1001,7 +1001,14 @@ EOF { $aReconcAttCodes[] = $oAttribute->getAttribute('id'); } - $sReconcKeys = "array('".implode("', '", $aReconcAttCodes)."')"; + if (empty($aReconcAttCodes)) + { + $sReconcKeys = "array()"; + } + else + { + $sReconcKeys = "array('".implode("', '", $aReconcAttCodes)."')"; + } } else {