aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2009-12-04 21:57:50 +0000
committerplegall <plg@piwigo.org>2009-12-04 21:57:50 +0000
commit110ce79b3c218bf05b61a84365a45357d36ec764 (patch)
tree17233cf96fb21213168c111ef19e4c8dc337dd1f
parenteaacc88183222375ee7d07b5f811ba6bf7cbc34e (diff)
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
Diffstat (limited to '')
-rw-r--r--include/ws_functions.inc.php12
1 files changed, 9 insertions, 3 deletions
diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php
index 733b220ac..6c73aa898 100644
--- a/include/ws_functions.inc.php
+++ b/include/ws_functions.inc.php
@@ -972,7 +972,9 @@ 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;
@@ -980,7 +982,9 @@ function merge_chunks($output_filepath, $original_sum, $type)
{
$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());
+ }
}
/*