MDL-18333: Conditional activities restore bug

diff --git a/backup/restorelib.php b/backup/restorelib.php
index eb6694f9db96a46e33da92a4defa2e0390b79b57..16706e31d0058cf99a3f2cbba98feaaba1c79a68 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -1178,8 +1178,14 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
                                         $course_module->completionview=$mod->completionview;
                                         $course_module->completionexpected=$mod->completionexpected;
 
-                                        $course_module->availablefrom=$mod->availablefrom+$restore->course_startdateoffset;
-                                        $course_module->availableuntil=$mod->availableuntil+$restore->course_startdateoffset;
+                                        $course_module->availablefrom=$mod->availablefrom;
+                                        if($mod->availablefrom!=0) {
+                                            $course_module->availablefrom+=$restore->course_startdateoffset;
+                                        }
+                                        $course_module->availableuntil=$mod->availableuntil;
+                                        if($mod->availableuntil!=0) {
+                                            $course_module->availableuntil+=$restore->course_startdateoffset;
+                                        }
                                         $course_module->showavailability=$mod->showavailability;
 
                                         $newidmod = $DB->insert_record("course_modules", $course_module);