diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-10-13 17:06:42 -0700 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-10-13 17:06:42 -0700 |
| commit | 5d055747d1a6b67d32cfa0594b6ea079b59f3cb9 (patch) | |
| tree | 5dd39308e6ce584b231026eb543c65dbfb2124ad /phpBB/includes/functions_acp.php | |
| parent | 85407986ead970b60ca75fdada9de774248c9a81 (diff) | |
| parent | bb616b4135fba145c961f26a4ff612d6579b6b17 (diff) | |
| download | forums-5d055747d1a6b67d32cfa0594b6ea079b59f3cb9.tar forums-5d055747d1a6b67d32cfa0594b6ea079b59f3cb9.tar.gz forums-5d055747d1a6b67d32cfa0594b6ea079b59f3cb9.tar.bz2 forums-5d055747d1a6b67d32cfa0594b6ea079b59f3cb9.tar.xz forums-5d055747d1a6b67d32cfa0594b6ea079b59f3cb9.zip | |
Merge pull request #415 from naderman/ticket/10412
[ticket/10412] Replace memory_get_usage with memory_get_peak_usage
Diffstat (limited to 'phpBB/includes/functions_acp.php')
| -rw-r--r-- | phpBB/includes/functions_acp.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index c3806dc786..36e22e069f 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -106,15 +106,13 @@ function adm_page_footer($copyright_html = true) if ($auth->acl_get('a_') && defined('DEBUG_EXTRA')) { - if (function_exists('memory_get_usage')) + if (function_exists('memory_get_peak_usage')) { - if ($memory_usage = memory_get_usage()) + if ($memory_usage = memory_get_peak_usage()) { - global $base_memory_usage; - $memory_usage -= $base_memory_usage; $memory_usage = get_formatted_filesize($memory_usage); - $debug_output .= ' | Memory Usage: ' . $memory_usage; + $debug_output .= ' | Peak Memory Usage: ' . $memory_usage; } } |