Permalink
Browse files

merge r4424 from branch 2.0 to trunk

bug 1210 fixed: check if the memory_get_usage function is available before
using it.


git-svn-id: http://piwigo.org/svn/trunk@4425 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information...
plegall committed Dec 4, 2009
1 parent eaacc88 commit 110ce79b3c218bf05b61a84365a45357d36ec764
Showing with 9 additions and 3 deletions.
  1. +9 −3 include/ws_functions.inc.php
@@ -972,15 +972,19 @@ function merge_chunks($output_filepath, $original_sum, $type)
sort($chunks);
ws_logfile('[merge_chunks] memory_get_usage before loading chunks: '.memory_get_usage());
if (function_exists('memory_get_usage')) {
ws_logfile('[merge_chunks] memory_get_usage before loading chunks: '.memory_get_usage());
}
$i = 0;
foreach ($chunks as $chunk)
{
$string = file_get_contents($chunk);
ws_logfile('[merge_chunks] memory_get_usage on chunk '.++$i.': '.memory_get_usage());
if (function_exists('memory_get_usage')) {
ws_logfile('[merge_chunks] memory_get_usage on chunk '.++$i.': '.memory_get_usage());
}
if (!file_put_contents($output_filepath, $string, FILE_APPEND))
{
@@ -991,7 +995,9 @@ function merge_chunks($output_filepath, $original_sum, $type)
unlink($chunk);
}
ws_logfile('[merge_chunks] memory_get_usage after loading chunks: '.memory_get_usage());
if (function_exists('memory_get_usage')) {
ws_logfile('[merge_chunks] memory_get_usage after loading chunks: '.memory_get_usage());
}
}
/*

0 comments on commit 110ce79

Please sign in to comment.