Merge pull request #1794 from jygaulier/PHRAS-1055_rebase-4.0

PHRAS-1055 backport to 4.0
This commit is contained in:
jygaulier
2016-04-06 17:14:53 +02:00

View File

@@ -179,14 +179,13 @@ class BuildSubdefs extends Command
if($this->databox !== null) { if($this->databox !== null) {
/** @var SubdefGroup $sg */ foreach ($this->databox->get_subdef_structure() as $sgname=>$sg) {
foreach ($this->databox->get_subdef_structure() as $sg) { if (empty($types) || in_array($sgname, $types)) {
if (empty($types) || in_array($sg->getName(), $types)) { $this->subdefsNameByType[$sgname] = [];
$this->subdefsNameByType[$sg->getName()] = [];
/** @var databox_subdef $sd */ /** @var databox_subdef $sd */
foreach ($sg as $sd) { foreach ($sg as $sd) {
if (empty($names) || in_array($sd->get_name(), $names)) { if (empty($names) || in_array($sd->get_name(), $names)) {
$this->subdefsNameByType[$sg->getName()][] = $sd->get_name(); $this->subdefsNameByType[$sgname][] = $sd->get_name();
} }
} }
} }