NOBUG. Restoring of backups performed in different TZ/DST was causing incorrect roll...

Prevent any roll of dates if differences are < 24h. Merged from 19_STABLE

diff --git a/backup/restore_check.html b/backup/restore_check.html
index eeb85b1026e615e0fdf4a457dcd5f7a63066decf..8e00ab2bfd2f6d3e1097bb5bc28465d38ed6eb71 100644 (file)
--- a/backup/restore_check.html
+++ b/backup/restore_check.html
@@ -32,6 +32,13 @@
             $currentcoursestartdate = $course_header->course_startdate;
             $coursestartdatedateoffset = $form1->startdate - $currentcoursestartdate;
             $restore->course_startdateoffset = $coursestartdatedateoffset; //change to restore
+            // Only apply rolling of dates if differences are bigger than one day
+            // that should solve current problems with daylight changes between
+            // backup and restore
+            if ($restore->course_startdateoffset < 24 * 60 * 60) {
+                $coursestartdatedateoffset = 0;
+                $restore->course_startdateoffset = 0;
+            }
         } else { // don't roll if the course hasn't start date
             $coursestartdatedateoffset = 0;
             $restore->course_startdateoffset = 0;