From 0a6baa4e47c12b3793786c98748485361e94f3a4 Mon Sep 17 00:00:00 2001
From: stronk7 <stronk7>
Date: Mon, 5 Oct 2009 16:56:52 +0000
Subject: [PATCH] NOBUG. Restoring of backups performed in different TZ/DST was
 causing incorrect roll to happen. Prevent any roll of dates if differences
 are < 24h. Merged from 19_STABLE

---
 backup/restore_check.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/backup/restore_check.html b/backup/restore_check.html
index eeb85b1026..8e00ab2bfd 100644
--- 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;
-- 
2.39.5