Index: branches/5.0.x/core/kernel/utility/unit_config_reader.php =================================================================== diff -u -r12167 -r12195 --- branches/5.0.x/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 12167) +++ branches/5.0.x/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 12195) @@ -1,6 +1,6 @@ prefixFiles) && ($this->prefixFiles[$prefix] != $filename)) { + trigger_error( + 'Single unit config prefix "' . $prefix . '" ' . + 'is used in multiple unit config files: ' . + '"' . $this->prefixFiles[$prefix] . '", "' . $filename . '"', + E_USER_WARNING + ); + } + $this->configData[$prefix] = $config; $this->prefixFiles[$prefix] = $filename; + return $prefix; } elseif ($prefix = array_search($filename, $this->prefixFiles)) { Index: branches/5.0.x/core/units/general/helpers/sections_helper.php =================================================================== diff -u -r12117 -r12195 --- branches/5.0.x/core/units/general/helpers/sections_helper.php (.../sections_helper.php) (revision 12117) +++ branches/5.0.x/core/units/general/helpers/sections_helper.php (.../sections_helper.php) (revision 12195) @@ -1,6 +1,6 @@ Application->UnitConfigReader->ReReadConfigs(); } - $this->Tree = Array(); + $this->Tree = Array (); // 1. build base tree (don't update parent with children list yet) @@ -110,6 +110,11 @@ $parent_section = $section_params['parent']; $section_order = "{$section_params['priority']}"; + if (!isset($parent_section)) { + // don't process parent section of "in-portal:root" section + continue; + } + if (!array_key_exists('children', $this->Tree[$parent_section])) { $this->Tree[$parent_section]['children'] = Array (); }