From: sam_marshall <sam_marshall>
Date: Fri, 20 Feb 2009 10:48:34 +0000 (+0000)
Subject: MDL-18333: Conditional activities restore bug
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=0e633d845a7c05c12904818a7094601ac8e01d05;p=moodle.git

MDL-18333: Conditional activities restore bug
---

diff --git a/backup/restorelib.php b/backup/restorelib.php
index eb6694f9db..16706e31d0 100644
--- 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);