Index: branches/5.2.x/core/kernel/utility/unit_config_reader.php =================================================================== diff -u -N -r14575 -r14628 --- branches/5.2.x/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 14575) +++ branches/5.2.x/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 14628) @@ -1,6 +1,6 @@ configData[$prefix]; - $deps = getArrayValue($config, '_Dependencies'); + $dependencies = getArrayValue($config, '_Dependencies'); + /* @var $dependencies Array */ - if (!$deps) { + if ( !$dependencies ) { return ; } - foreach ($deps as $real_class => $requires) { + foreach ($dependencies as $real_class => $requires) { foreach ($requires as $class) { $this->Application->registerDependency($real_class, $class); } @@ -720,9 +721,9 @@ function postProcessConfig($prefix, $config_key, $dst_prefix_var) { $main_config =& $this->configData[$prefix]; - $sub_configs = isset($main_config[$config_key]) && $main_config[$config_key] ? $main_config[$config_key] : false; // getArrayValue($main_config, $config_key); - if (!$sub_configs) { - return array(); + $sub_configs = isset($main_config[$config_key]) && $main_config[$config_key] ? $main_config[$config_key] : Array (); + if ( !$sub_configs ) { + return Array (); } unset($main_config[$config_key]); @@ -766,7 +767,7 @@ $config_found = file_exists(FULL_PATH . $filename) && $this->configAllowed($filename); if (defined('DEBUG_MODE') && DEBUG_MODE && defined('DBG_PROFILE_INCLUDES') && DBG_PROFILE_INCLUDES) { - if ( in_array($filename, get_required_files()) ) { + if ( in_array($filename, get_included_files()) ) { return ''; }