diff --git a/sources/DependencyInjection/DIException.php b/sources/DependencyInjection/DIException.php index 30439af31..b3926ba7f 100644 --- a/sources/DependencyInjection/DIException.php +++ b/sources/DependencyInjection/DIException.php @@ -1,4 +1,5 @@ aServices[$sName] = $oService; } /** @@ -57,4 +58,4 @@ class DIService return $this->aServices[$sName]; } -} \ No newline at end of file +} diff --git a/sources/Forms/Block/DataModel/AttributeChoiceFormBlock.php b/sources/Forms/Block/DataModel/AttributeChoiceFormBlock.php index 80d91c523..63cc1667c 100644 --- a/sources/Forms/Block/DataModel/AttributeChoiceFormBlock.php +++ b/sources/Forms/Block/DataModel/AttributeChoiceFormBlock.php @@ -68,11 +68,10 @@ class AttributeChoiceFormBlock extends ChoiceFormBlock $aAttributes = []; foreach ($aAttributeCodes as $sAttCode) { - $oAttribute =$oModelReflection->GetLabel($sClass, $sAttCode); - $aAttributes[$oAttribute->GetLabel()] = $sAttCode; + $sLabel = $oModelReflection->GetLabel($sClass, $sAttCode); + $aAttributes[$sLabel] = $sAttCode; } $oOptionsRegister->SetOption('choices', $aAttributes); } - } diff --git a/sources/Forms/IO/Format/AbstractIOFormat.php b/sources/Forms/IO/Format/AbstractIOFormat.php index 80b731373..06faf5a0e 100644 --- a/sources/Forms/IO/Format/AbstractIOFormat.php +++ b/sources/Forms/IO/Format/AbstractIOFormat.php @@ -1,4 +1,5 @@