MDL-14736 Backup/Restore don't halt backup if can't delete temp files - just display...

diff --git a/backup/backup_scheduled.php b/backup/backup_scheduled.php
index 28d6e451e10316e2d663f96cfff053da8a1901cd..c2abf718aa015fbb8196a07789467448349e1074 100644 (file)
--- a/backup/backup_scheduled.php
+++ b/backup/backup_scheduled.php
@@ -58,7 +58,11 @@ function schedule_backup_cron() {
     //Delete old_entries from backup tables
     if ($status) {
         mtrace("    Deleting old data");
-        $status = backup_delete_old_data();
+        if (!backup_delete_old_data()) {;
+            $errorstr = "An error occurred deleting old backup data";
+            add_to_backup_log(time(),$preferences->backup_course,$errorstr,'scheduledbackup');
+            mtrace("    ".$errorstr);
+        }
     }
 
     //Now we get a list of courses in the server

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 16706e31d0058cf99a3f2cbba98feaaba1c79a68..1c391e11ac7c4bf010c8e1b0ec31038ad84d3593 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -7497,7 +7497,13 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
             if (!defined('RESTORE_SILENTLY')) {
                 echo "<li>".get_string("deletingolddata").'</li>';
             }
-            $status = backup_delete_old_data();
+            if (!backup_delete_old_data()) {;
+                $errorstr = "An error occurred deleting old data";
+                add_to_backup_log(time(),$preferences->backup_course,$errorstr,'restoreprecheck');
+                if (!defined('RESTORE_SILENTLY')) {
+                    notify($errorstr);
+                }
+            }
         }
 
         //Now copy he zip file to dataroot/temp/backup/backup_unique_code