Increase memory_limit to 128 in backups & restore.

Merged from MOODLE_14_STABLE

diff --git a/admin/cron.php b/admin/cron.php
index f9b5686b92004bf0b48080d5e9f3496fb35bce0d..9972b2918fd9d7e48da00bb5bc743dbdd59fb5f6 100644 (file)
--- a/admin/cron.php
+++ b/admin/cron.php
@@ -144,7 +144,7 @@
         //Execute backup's cron
         //Perhaps a long time and memory could help in large sites
         @set_time_limit(0);
-        ini_set("memory_limit","56M");
+        @ini_set("memory_limit","128M");
         if (file_exists("$CFG->dirroot/backup/backup_scheduled.php") and
             file_exists("$CFG->dirroot/backup/backuplib.php") and
             file_exists("$CFG->dirroot/backup/lib.php") and

diff --git a/backup/backup.php b/backup/backup.php
index 338f1286412073b132581f74cc1a6ded1c0dd89d..6f7ef15ee261cc1c7b51917b7fd2b7ec3e22a240 100644 (file)
--- a/backup/backup.php
+++ b/backup/backup.php
@@ -87,8 +87,8 @@
     print_simple_box_start("center", "", "$THEME->cellheading");
 
     //Adjust some php variables to the execution of this script
-    ini_set("max_execution_time","3000");
-    ini_set("memory_limit","80M");
+    @ini_set("max_execution_time","3000");
+    @ini_set("memory_limit","128M");
 
     //Call the form, depending the step we are
     if (!$launch) {

diff --git a/backup/restore.php b/backup/restore.php
index 12753fc810c1f8894d9703880bc4e057f3441985..97f15713239aeb2d84dfb962ce6b6c799fceeddd 100644 (file)
--- a/backup/restore.php
+++ b/backup/restore.php
@@ -94,8 +94,8 @@
     print_simple_box_start("center", "", "$THEME->cellheading");
     
     //Adjust some php variables to the execution of this script
-    ini_set("max_execution_time","3000");
-    ini_set("memory_limit","80M");
+    @ini_set("max_execution_time","3000");
+    @ini_set("memory_limit","128M");
 
     //Call the form, depending the step we are
     if (!$launch) {

diff --git a/backup/try.php b/backup/try.php
index b10e0527043f80eca9b1611f3dfa874632fb2d51..60cd8254024e47143d01c4f490057c704661fdbd 100644 (file)
--- a/backup/try.php
+++ b/backup/try.php
@@ -20,8 +20,8 @@
     backup_required_functions();
 
     //Adjust some php variables to the execution of this script
-    ini_set("max_execution_time","3000");
-    ini_set("memory_limit","56M");
+    @ini_set("max_execution_time","3000");
+    @ini_set("memory_limit","128M");
 
     echo "<pre>\n";