Index: trunk/core/kernel/utility/unit_config_reader.php =================================================================== diff -u -r3330 -r3620 --- trunk/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 3330) +++ trunk/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 3620) @@ -34,7 +34,7 @@ { $module_found = false; if (!$this->Application->ModuleInfo) return false; - + foreach($this->Application->ModuleInfo as $module_name => $module_info) { $module_path = '/'.$module_info['Path']; @@ -97,7 +97,7 @@ else { include_once($file); } - + if ( !isset($config) || !$config ) continue; $prefix = $config['Prefix']; $config['BasePath'] = $full_path; @@ -119,16 +119,16 @@ { $clone_config['Prefix'] = $clone_prefix; $this->configData[$clone_prefix] = array_merge_recursive2($this->configData[$prefix], $clone_config); - + foreach($clone_config as $cloned_property => $cloned_value) { if(!$cloned_value) unset($this->configData[$clone_prefix][$cloned_property]); } - + $this->ParseConfigClones($clone_prefix); } } - + function ParseConfigs() { foreach ($this->configData as $prefix => $config) @@ -188,7 +188,7 @@ if($config_found && isset($config) && $config) { $prefix = $config['Prefix']; - + preg_match('/\/(.*)\//U', $filename, $rets); $config['ModuleFolder'] = $rets[1]; $config['BasePath'] = dirname(FULL_PATH.$filename); @@ -205,7 +205,8 @@ if (defined('CACHE_CONFIGS_FILES')) { $conn =& $this->Application->GetADODBConnection(); $data = $conn->GetRow('SELECT Data, Cached FROM '.TABLE_PREFIX.'Cache WHERE VarName = "config_files"'); - if ($data && $data['Cached'] > (adodb_mktime() - 3600) ) { +// if ($data && $data['Cached'] > (adodb_mktime() - 3600) ) { + if ($data && $data['Cached'] > 0 ) { $this->configFiles = unserialize($data['Data']); $files_cached = $data['Cached']; } @@ -450,9 +451,9 @@ */ function isDir($folderPath) { - $base_name=basename($folderPath); - $ret=!($base_name=='.'||$base_name=='..'); - return $ret&&is_dir($folderPath); + $base_name = basename($folderPath); + $ret = !( $base_name == '.' || $base_name == '..' ); + return $ret && is_dir($folderPath); }