Index: trunk/core/kernel/utility/unit_config_reader.php =================================================================== diff -u -r2600 -r2604 --- trunk/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 2600) +++ trunk/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 2604) @@ -92,11 +92,11 @@ $debugger->IncludeLevel++; $before_time = getmicrotime(); $before_mem = memory_get_usage(); - include_once(DOC_ROOT.BASE_PATH.$file); + include_once(FULL_PATH.$file); $used_time = getmicrotime() - $before_time; $used_mem = memory_get_usage() - $before_mem; $debugger->IncludeLevel--; - $debugger->IncludesData['file'][] = str_replace(DOC_ROOT.BASE_PATH, '', $file); + $debugger->IncludesData['file'][] = str_replace(FULL_PATH, '', $file); $debugger->IncludesData['mem'][] = $used_mem; $debugger->IncludesData['time'][] = $used_time; $debugger->IncludesData['level'][] = -1; @@ -123,14 +123,14 @@ function findConfigFiles($folderPath) { - $folderPath = str_replace(DOC_ROOT.BASE_PATH, '', $folderPath); - $fh=opendir(DOC_ROOT.BASE_PATH.$folderPath); + $folderPath = str_replace(FULL_PATH, '', $folderPath); // this make sense, since $folderPath may NOT contain FULL_PATH + $fh=opendir(FULL_PATH.$folderPath); while(($sub_folder=readdir($fh))) { - $full_path=DOC_ROOT.BASE_PATH.$folderPath.'/'.$sub_folder; + $full_path=FULL_PATH.$folderPath.'/'.$sub_folder; if( $this->isDir($full_path)) { - if ( file_exists(DOC_ROOT.BASE_PATH.$this->getConfigName($folderPath.'/'.$sub_folder)) ) { + if ( file_exists(FULL_PATH.$this->getConfigName($folderPath.'/'.$sub_folder)) ) { $this->configFiles[] = $this->getConfigName($folderPath.'/'.$sub_folder); } $this->findConfigFiles($full_path); @@ -155,11 +155,11 @@ $debugger->IncludeLevel++; $before_time = getmicrotime(); $before_mem = memory_get_usage(); - if($config_found) include_once(DOC_ROOT.BASE_PATH.$filename); + if($config_found) include_once(FULL_PATH.$filename); $used_time = getmicrotime() - $before_time; $used_mem = memory_get_usage() - $before_mem; $debugger->IncludeLevel--; - $debugger->IncludesData['file'][] = str_replace(DOC_ROOT.BASE_PATH, '', $filename); + $debugger->IncludesData['file'][] = str_replace(FULL_PATH, '', $filename); $debugger->IncludesData['mem'][] = $used_mem; $debugger->IncludesData['time'][] = $used_time; $debugger->IncludesData['level'][] = -1;