From: sam_marshall <sam_marshall>
Date: Thu, 24 May 2007 12:09:49 +0000 (+0000)
Subject: MDL-9932 Fixed calendar restore of events on same day with same description (but... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=c5a3ce0acd8acefc9d4b2524a225df009b74ba77;p=moodle.git

MDL-9932 Fixed calendar restore of events on same day with same description (but different names)
---

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 0aebd90015..457e23d475 100644
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -2472,9 +2472,10 @@
                         $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;