L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-15372 fixed incorrect merging to HEAD causing fatal errors, because new dml api was not used

Browse Source
This commit is contained in:
skodak
2008-06-25 07:30:41 +00:00
parent ed28ebd16b
commit 511c9eb23b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backup/restorelib.php
+6 -6
View File
@@ -97,11 +97,11 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
if (!defined('RESTORE_SILENTLY')) {
echo '<li>' . get_string('from') . ' ' . get_string('course');
}
$course = get_record('course', 'id', $restore->course_id, '', '', '', '', 'id,summary');
$course = $DB->get_record('course', array('id'=>$restore->course_id), 'id,summary');
$coursesummary = restore_decode_content_links_worker($course->summary, $restore);
if ($coursesummary != $course->summary) {
$course->summary = addslashes($coursesummary);
if (!update_record('course', $course)) {
$course->summary = $coursesummary;
if (!$DB->update_record('course', $course)) {
$status = false;
}
}
@@ -110,7 +110,7 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
}
// Recode links in section summaries.
$sections = get_records('course_sections', 'course', $restore->course_id, 'id', 'id,summary');
$sections = $DB->get_records('course_sections', array('course'=>$restore->course_id), 'id', 'id,summary');
if ($sections) {
if (!defined('RESTORE_SILENTLY')) {
echo '<li>' . get_string('from') . ' ' . get_string('sections');
@@ -118,8 +118,8 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
foreach ($sections as $section) {
$sectionsummary = restore_decode_content_links_worker($section->summary, $restore);
if ($sectionsummary != $section->summary) {
$section->summary = addslashes($sectionsummary);
if (!update_record('course_sections', $section)) {
$section->summary = $sectionsummary;
if (!$DB->update_record('course_sections', $section)) {
$status = false;
}
}