Changeset 4425

Timestamp:

Dec 4, 2009, 10:57:50 PM (15 years ago)

Author:

plg

Message:

merge r4424 from branch 2.0 to trunk

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

File:

• trunk/include/ws_functions.inc.php (modified) (3 diffs)

trunk/include/ws_functions.inc.php

@@ -973 +973 @@
   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;
@@ -981 +983 @@
     $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))
@@ -992 +996 @@
   }
 
-  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());
+  }
 }