Index: trunk/kernel/include/config.php =================================================================== diff -u -r2000 -r2578 --- trunk/kernel/include/config.php (.../config.php) (revision 2000) +++ trunk/kernel/include/config.php (.../config.php) (revision 2578) @@ -409,6 +409,8 @@ if( $GLOBALS['debuglevel'] ) echo $sql."
\n"; $adodbConnection = &GetADODBConnection(); $rs = $adodbConnection->Execute($sql); + $i = null; + $last = ''; while($rs && !$rs->EOF) { $data = $rs->fields; Index: trunk/core/kernel/utility/debugger.php =================================================================== diff -u -r2566 -r2578 --- trunk/core/kernel/utility/debugger.php (.../debugger.php) (revision 2566) +++ trunk/core/kernel/utility/debugger.php (.../debugger.php) (revision 2578) @@ -504,15 +504,18 @@ $this->appendHTML('Hide Debugger'); $this->moveToBegin(1); - if ( dbg_ConstOn('DBG_SQL_PROFILE') ) { + if( dbg_ConstOn('DBG_SQL_PROFILE') && getArrayValue($this->ProfilerTotals, 'sql') ) + { $this->appendHTML('SQL Total time: '.$this->ProfilerTotals['sql']); } - if ( dbg_ConstOn('DBG_PROFILE_MEMORY') ) { + if( dbg_ConstOn('DBG_PROFILE_MEMORY') ) + { $this->appendHTML('Memory used by Objects: '.round($this->ProfilerTotals['objects']/1024, 2).'Kb'); } - if ( dbg_ConstOn('DBG_INCLUDED_FILES') ) { + if( dbg_ConstOn('DBG_INCLUDED_FILES') ) + { $files = get_included_files(); $this->appendHTML('Included files:'); foreach ($files as $file) @@ -521,7 +524,8 @@ } } - if ( dbg_ConstOn('DBG_PROFILE_INCLUDES') ) { + if( dbg_ConstOn('DBG_PROFILE_INCLUDES') ) + { $this->appendHTML('Included files statistics:'.( dbg_ConstOn('DBG_SORT_INCLUDES_MEM') ? ' (sorted by memory usage)':'')); $totals = Array( 'mem' => 0, 'time' => 0); $totals_configs = Array( 'mem' => 0, 'time' => 0); @@ -542,8 +546,6 @@ $this->appendHTML('Sub-Total classes: '.' Mem: '.sprintf("%.4f Kb", $totals['mem']/1024).' Time: '.sprintf("%.4f", $totals['time'])); $this->appendHTML('Sub-Total configs: '.' Mem: '.sprintf("%.4f Kb", $totals_configs['mem']/1024).' Time: '.sprintf("%.4f", $totals_configs['time'])); $this->appendHTML('Grand Total: '.' Mem: '.sprintf("%.4f Kb", ($totals['mem']+$totals_configs['mem'])/1024).' Time: '.sprintf("%.4f", $totals['time']+$totals_configs['time'])); - - } Index: trunk/admin/config/config_search.php =================================================================== diff -u -r2569 -r2578 --- trunk/admin/config/config_search.php (.../config_search.php) (revision 2569) +++ trunk/admin/config/config_search.php (.../config_search.php) (revision 2578) @@ -145,7 +145,8 @@ } else $SubmitUrl = $_SERVER['PHP_SELF']."?".$envar; - + +if( !isset($title) ) $title = ''; int_header($objCatToolBar,NULL,$title); ?>
Index: trunk/admin/config/edit_config.php =================================================================== diff -u -r2569 -r2578 --- trunk/admin/config/edit_config.php (.../edit_config.php) (revision 2569) +++ trunk/admin/config/edit_config.php (.../edit_config.php) (revision 2578) @@ -123,7 +123,7 @@ $SubmitUrl = $_SERVER['PHP_SELF']."?".$envar; - +$title = ''; int_header($objCatToolBar,NULL,$title); ?> Index: trunk/kernel/include/debugger.php =================================================================== diff -u -r2567 -r2578 --- trunk/kernel/include/debugger.php (.../debugger.php) (revision 2567) +++ trunk/kernel/include/debugger.php (.../debugger.php) (revision 2578) @@ -504,15 +504,18 @@ $this->appendHTML('Hide Debugger'); $this->moveToBegin(1); - if ( dbg_ConstOn('DBG_SQL_PROFILE') ) { + if( dbg_ConstOn('DBG_SQL_PROFILE') && getArrayValue($this->ProfilerTotals, 'sql') ) + { $this->appendHTML('SQL Total time: '.$this->ProfilerTotals['sql']); } - if ( dbg_ConstOn('DBG_PROFILE_MEMORY') ) { + if( dbg_ConstOn('DBG_PROFILE_MEMORY') ) + { $this->appendHTML('Memory used by Objects: '.round($this->ProfilerTotals['objects']/1024, 2).'Kb'); } - if ( dbg_ConstOn('DBG_INCLUDED_FILES') ) { + if( dbg_ConstOn('DBG_INCLUDED_FILES') ) + { $files = get_included_files(); $this->appendHTML('Included files:'); foreach ($files as $file) @@ -521,7 +524,8 @@ } } - if ( dbg_ConstOn('DBG_PROFILE_INCLUDES') ) { + if( dbg_ConstOn('DBG_PROFILE_INCLUDES') ) + { $this->appendHTML('Included files statistics:'.( dbg_ConstOn('DBG_SORT_INCLUDES_MEM') ? ' (sorted by memory usage)':'')); $totals = Array( 'mem' => 0, 'time' => 0); $totals_configs = Array( 'mem' => 0, 'time' => 0); @@ -542,8 +546,6 @@ $this->appendHTML('Sub-Total classes: '.' Mem: '.sprintf("%.4f Kb", $totals['mem']/1024).' Time: '.sprintf("%.4f", $totals['time'])); $this->appendHTML('Sub-Total configs: '.' Mem: '.sprintf("%.4f Kb", $totals_configs['mem']/1024).' Time: '.sprintf("%.4f", $totals_configs['time'])); $this->appendHTML('Grand Total: '.' Mem: '.sprintf("%.4f Kb", ($totals['mem']+$totals_configs['mem'])/1024).' Time: '.sprintf("%.4f", $totals['time']+$totals_configs['time'])); - - }