]> git.mjollnir.org Git - moodle.git/commitdiff
MDL-9932 Fixed calendar restore of events on same day with same description (but...
authorsam_marshall <sam_marshall>
Thu, 24 May 2007 12:09:49 +0000 (12:09 +0000)
committersam_marshall <sam_marshall>
Thu, 24 May 2007 12:09:49 +0000 (12:09 +0000)
backup/restorelib.php

index 0aebd900155dc02f7f8dc8695dcb1ab7d9172485..457e23d4759c80ee04edf999b8130aa3eb4fba65 100644 (file)
                         $eve->visible = backup_todb($info['EVENT']['#']['VISIBLE']['0']['#']);
                         $eve->timemodified = backup_todb($info['EVENT']['#']['TIMEMODIFIED']['0']['#']);
 
-                        //Now search if that event exists (by description and timestart field) in
-                        //restore->course_id course 
-                        $eve_db = get_record("event","courseid",$eve->courseid,"description",$eve->description,"timestart",$eve->timestart);
+                        //Now search if that event exists (by name, description, timestart fields) in
+                        //restore->course_id course
+                        $eve_db = get_record_select("event",
+                            "courseid={$eve->courseid} AND name='{$eve->name}' AND description='{$eve->description}' AND timestart=$eve->timestart");
                         //If it doesn't exist, create
                         if (!$eve_db) {
                             $create_event = true;