Changeset 1886
- Timestamp:
- 08/30/06 18:18:03 (4 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/rovert-0.6/lib/debug/sfWebDebug.class.php
r1866 r1886 233 233 // ignore cache link 234 234 $cacheLink = ''; 235 if ( sfConfig::get('sf_debug') && sfConfig::get('sf_cache'))235 if ($sfDebug = sfConfig::get('sf_debug') && sfConfig::get('sf_cache')) 236 236 { 237 237 $self_url = $_SERVER['PHP_SELF'].((strpos($_SERVER['PHP_SELF'], 'sf_ignore_cache') === false) ? '?sf_ignore_cache=1' : ''); … … 262 262 // memory used 263 263 $memoryInfo = ''; 264 if (sfConfig::get('sf_debug') && function_exists('memory_get_usage')) 265 { 266 $total_memory = sprintf('%.1f', (memory_get_usage() / 1024)); 264 $total_memory = 0; 265 if ($sfDebug && function_exists('memory_get_peak_usage')) 266 { 267 $total_memory = memory_get_peak_usage(); 268 } 269 else if ($sfDebug && function_exists('memory_get_usage')) 270 { 271 $total_memory = memory_get_usage(); 272 } 273 if ($total_memory) 274 { 275 $total_memory = sprintf('%.1f', ($total_memory / 1024)); 267 276 $memoryInfo = '<li><img src="'.$this->base_image_path.'/memory.png" alt=""/> '.$total_memory.' KB</li>'; 268 277 } … … 270 279 // total time elapsed 271 280 $timeInfo = ''; 272 if ( sfConfig::get('sf_debug'))281 if ($sfDebug) 273 282 { 274 283 $total_time = (microtime(true) - sfConfig::get('sf_timer_start')) * 1000;
