From 4b8980fc8375bb036f6a4654acabcd8efffbd927 Mon Sep 17 00:00:00 2001
From: martinlanghoff <martinlanghoff>
Date: Sat, 20 Nov 2004 10:37:03 +0000
Subject: [PATCH] Fixing handling of empty memory_limit for PHP without
 memory_limit (mostly Windows binaries)- fixed typo

---
 lib/moodlelib.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 3488ac5dc21..901d2416022 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -3344,9 +3344,19 @@ function raise_memory_limit ($newlimit) {
         return false;
     }
     
-    $cur = return_bytes(@ini_get('memory_limit'));
-    $new = return_bytes($newlimit);
+    $cur = @ini_get('memory_limit');
+    if (empty($cur)) {
+        // if php is compiled without --enable-memory-limits
+        // apparently memory_limit is set to ''
+        $cur=0;
+    } else {
+        if ($cur == -1){
+            return true; // unlimited mem!
+        }
+      $cur = return_bytes($cur);
+    }
     
+    $new = return_bytes($newlimit);
     if ($new > $cur) {
         ini_set('memory_limit', $newlimit);
         return true;