Merge from MOODLE_14_STABLE

raise_memory() now uses get_real_size(), duplicate function return_bytes() removed.

Issue discussed in 2202 (http://moodle.org/bugs/bug.php?op=show&bugid=2202).
Also seen as arch-eduforge@catalyst.net.nz--2004/moodle--eduforge--1.3.3--patch-424

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index f61de41720055d4c1b5de055f6bada193427b3d8..289ad938c89fd6dc80df0692cfd823a7175a88e7 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -3299,10 +3299,10 @@ function raise_memory_limit ($newlimit) {
         if ($cur == -1){
             return true; // unlimited mem!
         }
-      $cur = return_bytes($cur);
+      $cur = get_real_size($cur);
     }
 
-    $new = return_bytes($newlimit);
+    $new = get_real_size($newlimit);
     if ($new > $cur) {
         ini_set('memory_limit', $newlimit);
         return true;
@@ -3310,34 +3310,6 @@ function raise_memory_limit ($newlimit) {
     return false;
 }
 
-/**
-* Function to transform strings like 5M or 128k into bytes.
-* Taken from PHP's documentation (see entry for ini_get())
-*
-* Return integer (in bytes)
-*
-* @param    value    string with the value
-*/
-function return_bytes($val) {
-   $val = trim($val);
-   if (empty($val)) {
-       return '';
-   }
-   $last = $val{strlen($val)-1};
-   switch($last) {
-       case 'k':
-       case 'K':
-           return (int) $val * 1024;
-           break;
-       case 'm':
-       case 'M':
-           return (int) $val * 1048576;
-           break;
-       default:
-           return $val;
-   }
-}
-
 /// ENCRYPTION  ////////////////////////////////////////////////
 
 /**