"MDL-18540, change the uses of option"

diff --git a/admin/health.php b/admin/health.php
index 71401842e4cb5e3ac185af78688d2a8b8d82e4d8..b68fa467059d867fcda85b5c42aa5a6c826ba1f3 100644 (file)
--- 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 307ec55b3fd75f619b4b102af774d0cab87d19c5..e635b0caa880f2b5ecacd0015f390c2583410fa3 100644 (file)
--- 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 6e583ea9d9ccb8fe85e9160e9c6dded259bab36d..19a3024782f7a5ed3b4dc120e938050886f31fec 100644 (file)
--- 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 83cf2ca557285b67a034ac217fa42a2b8ee7f8f9..98caa189749a2c62ad9d3892b0ac77c32cb5ed73 100644 (file)
--- 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 "<pre>\n";

diff --git a/search/cron_php5.php b/search/cron_php5.php
index b6542f55ecedf157fc7ae7114b21ecd8a8e78612..276147332b88b11dc30a83a69d93cb8113e9f247 100644 (file)
--- 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----");