diff --git a/admin/health.php b/admin/health.php index 71401842e4c..b68fa467059 100644 --- a/admin/health.php +++ b/admin/health.php @@ -363,10 +363,10 @@ class problem_000008 extends problem_base { } $oldmemlimit = get_real_size($oldmemlimit); //now lets change the memory limit to something unique below 128M==134217728 - if (empty($CFG->memorylimit)) { + if (empty($CFG->extramemorylimit)) { raise_memory_limit('128M'); } else { - raise_memory_limit($CFG->memorylimit); + raise_memory_limit($CFG->extramemorylimit); } $testmemlimit = get_real_size(@ini_get('memory_limit')); //verify the change had any effect at all diff --git a/backup/lib.php b/backup/lib.php index 307ec55b3fd..e635b0caa88 100644 --- a/backup/lib.php +++ b/backup/lib.php @@ -548,10 +548,10 @@ return false; } @ini_set("max_execution_time","3000"); - if (empty($CFG->memorylimit)) { + if (empty($CFG->extramemorylimit)) { raise_memory_limit('128M'); } else { - raise_memory_limit($CFG->memorylimit); + raise_memory_limit($CFG->extramemorylimit); } if (!$backup_unique_code = restore_precheck($destinationcourse,$pathtofile,$errorstr,true)) { diff --git a/backup/restore.php b/backup/restore.php index 6e583ea9d9c..19a3024782f 100644 --- a/backup/restore.php +++ b/backup/restore.php @@ -141,10 +141,10 @@ //Adjust some php variables to the execution of this script @ini_set("max_execution_time","3000"); - if (empty($CFG->memorylimit)) { + if (empty($CFG->extramemorylimit)) { raise_memory_limit('128M'); } else { - raise_memory_limit($CFG->memorylimit); + raise_memory_limit($CFG->extramemorylimit); } //Call the form, depending the step we are diff --git a/backup/try.php b/backup/try.php index 83cf2ca5572..98caa189749 100644 --- a/backup/try.php +++ b/backup/try.php @@ -19,10 +19,10 @@ //Adjust some php variables to the execution of this script @ini_set("max_execution_time","3000"); - if (empty($CFG->memorylimit)) { + if (empty($CFG->extramemorylimit)) { raise_memory_limit('128M'); } else { - raise_memory_limit($CFG->memorylimit); + raise_memory_limit($CFG->extramemorylimit); } echo "
\n";
diff --git a/search/cron_php5.php b/search/cron_php5.php
index b6542f55ece..276147332b8 100644
--- a/search/cron_php5.php
+++ b/search/cron_php5.php
@@ -14,10 +14,10 @@
 
 try{
     ini_set('max_execution_time', 300);
-    if (empty($CFG->memorylimit)) {
+    if (empty($CFG->extramemorylimit)) {
         raise_memory_limit('128M');
     } else {
-        raise_memory_limit($CFG->memorylimit);
+        raise_memory_limit($CFG->extramemorylimit);
     }
 
     mtrace("\n--DELETE----");