moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-42768-master' of git://github.com/FMCorz/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2013-11-13 23:15:23 +01:00
commit 529d3bad0e
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
backup/moodle2/restore_stepslib.php
View file

@ -2210,9 +2210,15 @@ class restore_calendarevents_structure_step extends restore_structure_step {
} else { } else {
$params['instance'] = 0; $params['instance'] = 0;
} }
$sql = 'SELECT id FROM {event} WHERE name = ? AND courseid = ? AND $sql = "SELECT id
repeatid = ? AND modulename = ? AND timestart = ? AND timeduration =? FROM {event}
AND ' . $DB->sql_compare_text('description', 255) . ' = ' . $DB->sql_compare_text('?', 255); WHERE " . $DB->sql_compare_text('name', 255) . " = " . $DB->sql_compare_text('?', 255) . "
AND courseid = ?
AND repeatid = ?
AND modulename = ?
AND timestart = ?
AND timeduration = ?
AND " . $DB->sql_compare_text('description', 255) . " = " . $DB->sql_compare_text('?', 255);
$arg = array ($params['name'], $params['courseid'], $params['repeatid'], $params['modulename'], $params['timestart'], $params['timeduration'], $params['description']); $arg = array ($params['name'], $params['courseid'], $params['repeatid'], $params['modulename'], $params['timestart'], $params['timeduration'], $params['description']);
$result = $DB->record_exists_sql($sql, $arg); $result = $DB->record_exists_sql($sql, $arg);
if (empty($result)) { if (empty($result)) {