Index: trunk/admin/install/install_lib.php =================================================================== diff -u -N -r4874 -r4885 --- trunk/admin/install/install_lib.php (.../install_lib.php) (revision 4874) +++ trunk/admin/install/install_lib.php (.../install_lib.php) (revision 4885) @@ -493,6 +493,7 @@ function _inst_GetObscureValue($i) { + $z = null; if ($i == 'x') return 0254; if ($i == 'z') return 0x7F.'.'; if ($i >= 5 && $i < 7) return _inst_GetObscureValue($z)*_inst_GetObscureValue('e'); @@ -511,10 +512,11 @@ function _inst_IsLocalSite($domain) { + $yy = ''; $ee = _inst_GetObscureValue(35); - foreach ($ee as $e) { - $yy .= _inst_Chr($e); - } + foreach ($ee as $e) { + $yy .= _inst_Chr($e); + } $localb = FALSE; if(substr($domain,0,3)==_inst_GetObscureValue('x')) { Index: trunk/core/kernel/utility/debugger.php =================================================================== diff -u -N -r4880 -r4885 --- trunk/core/kernel/utility/debugger.php (.../debugger.php) (revision 4880) +++ trunk/core/kernel/utility/debugger.php (.../debugger.php) (revision 4885) @@ -750,7 +750,13 @@ window.focus(); ProfilerTotals['error_handling']; + if (!isset($this->ProfilerTotals['error_handling'])) { + $memory_used = $debugger_start; + $this->ProfilerTotalCount['error_handling'] = 0; + } + else { + $memory_used = $debugger_start - $this->ProfilerTotals['error_handling']; + } if ($returnResult) { $ret = ob_get_contents(); Index: trunk/kernel/startup.php =================================================================== diff -u -N -r4644 -r4885 --- trunk/kernel/startup.php (.../startup.php) (revision 4644) +++ trunk/kernel/startup.php (.../startup.php) (revision 4885) @@ -17,11 +17,6 @@ } include_once(FULL_PATH.'/kernel/kernel4/startup.php'); - // just to make sure that this is correctly detected - if ( IsDebugMode() ) { - $debugger->printConstants('FULL_PATH,SQL_DB'); - } - $application =& kApplication::Instance(); $application->Init(); $application->ProcessRequest(); Index: trunk/kernel/units/languages/languages_event_handler.php =================================================================== diff -u -N -r4758 -r4885 --- trunk/kernel/units/languages/languages_event_handler.php (.../languages_event_handler.php) (revision 4758) +++ trunk/kernel/units/languages/languages_event_handler.php (.../languages_event_handler.php) (revision 4885) @@ -29,7 +29,7 @@ { $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper'); - $this->Application->UnitConfigReader->includeConfigFiles(); //make sure to re-read all configs + $this->Application->UnitConfigReader->includeConfigFiles(MODULES_PATH); //make sure to re-read all configs foreach ($this->Application->UnitConfigReader->configData as $prefix => $config_data) { $ml_helper->createFields($prefix); } Index: trunk/kernel/units/general/helpers/sections_helper.php =================================================================== diff -u -N -r4770 -r4885 --- trunk/kernel/units/general/helpers/sections_helper.php (.../sections_helper.php) (revision 4770) +++ trunk/kernel/units/general/helpers/sections_helper.php (.../sections_helper.php) (revision 4885) @@ -39,7 +39,7 @@ $this->Tree = unserialize($data['Data']); return ; } - $this->Application->UnitConfigReader->includeConfigFiles(); + $this->Application->UnitConfigReader->includeConfigFiles(MODULES_PATH); $this->Tree = Array(); if (!$unit_config_reader) { Index: trunk/core/units/languages/languages_event_handler.php =================================================================== diff -u -N -r4758 -r4885 --- trunk/core/units/languages/languages_event_handler.php (.../languages_event_handler.php) (revision 4758) +++ trunk/core/units/languages/languages_event_handler.php (.../languages_event_handler.php) (revision 4885) @@ -29,7 +29,7 @@ { $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper'); - $this->Application->UnitConfigReader->includeConfigFiles(); //make sure to re-read all configs + $this->Application->UnitConfigReader->includeConfigFiles(MODULES_PATH); //make sure to re-read all configs foreach ($this->Application->UnitConfigReader->configData as $prefix => $config_data) { $ml_helper->createFields($prefix); } Index: trunk/core/units/general/helpers/sections_helper.php =================================================================== diff -u -N -r4770 -r4885 --- trunk/core/units/general/helpers/sections_helper.php (.../sections_helper.php) (revision 4770) +++ trunk/core/units/general/helpers/sections_helper.php (.../sections_helper.php) (revision 4885) @@ -39,7 +39,7 @@ $this->Tree = unserialize($data['Data']); return ; } - $this->Application->UnitConfigReader->includeConfigFiles(); + $this->Application->UnitConfigReader->includeConfigFiles(MODULES_PATH); $this->Tree = Array(); if (!$unit_config_reader) {