diff --git a/README.txt b/README.txt index 84f62cbc..26e403b2 100644 --- a/README.txt +++ b/README.txt @@ -26,7 +26,7 @@ because the feature doesn't work yet :P Requirements ~~~~~~~~~~~~ MySQL 5.1+ (with experimental support for PostgreSQL 8+ and SQLite 3) -PHP 5.2+ +PHP 5.2.6+ GD or ImageMagick diff --git a/core/util.inc.php b/core/util.inc.php index a01c52b2..e9a8583d 100644 --- a/core/util.inc.php +++ b/core/util.inc.php @@ -907,12 +907,7 @@ $_load_start = microtime(true); function get_debug_info() { global $config, $_event_count, $database, $_execs, $_load_start; - if(function_exists('memory_get_usage')) { - $i_mem = sprintf("%5.2f", ((memory_get_usage()+512)/1024)/1024); - } - else { - $i_mem = "???"; - } + $i_mem = sprintf("%5.2f", ((memory_get_peak_usage(true)+512)/1024)/1024); if($config->get_string("commit_hash", "unknown") == "unknown"){ $commit = "";