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

MDL-25708 recordsets - page and quiz modules

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2011-01-25 19:59:01 +01:00
parent a8307c22c2
commit 3f2efc20ad
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/page/db/upgradelib.php
+12 -14
View File
@@ -51,24 +51,22 @@ function page_20_migrate() {
$fs = get_file_storage();
if ($candidates = $DB->get_recordset('resource_old', array('type'=>'html', 'migrated'=>0))) {
foreach ($candidates as $candidate) {
page_20_migrate_candidate($candidate, $fs, FORMAT_HTML);
}
$candidates->close();
$candidates = $DB->get_recordset('resource_old', array('type'=>'html', 'migrated'=>0));
foreach ($candidates as $candidate) {
page_20_migrate_candidate($candidate, $fs, FORMAT_HTML);
}
$candidates->close();
if ($candidates = $DB->get_recordset('resource_old', array('type'=>'text', 'migrated'=>0))) {
foreach ($candidates as $candidate) {
//there might be some rubbish instead of format int value
$format = (int)$candidate->reference;
if ($format < 0 or $format > 4) {
$format = FORMAT_MOODLE;
}
page_20_migrate_candidate($candidate, $fs, $format);
$candidates = $DB->get_recordset('resource_old', array('type'=>'text', 'migrated'=>0));
foreach ($candidates as $candidate) {
//there might be some rubbish instead of format int value
$format = (int)$candidate->reference;
if ($format < 0 or $format > 4) {
$format = FORMAT_MOODLE;
}
$candidates->close();
page_20_migrate_candidate($candidate, $fs, $format);
}
$candidates->close();
// clear all course modinfo caches
rebuild_course_cache(0, true);
mod/quiz/lib.php
+3 -2
View File
@@ -604,7 +604,8 @@ function quiz_upgrade_grades() {
$sql = "SELECT a.*, cm.idnumber AS cmidnumber, a.course AS courseid
FROM {quiz} a, {course_modules} cm, {modules} m
WHERE m.name='quiz' AND m.id=cm.module AND cm.instance=a.id";
if ($rs = $DB->get_recordset_sql($sql)) {
$rs = $DB->get_recordset_sql($sql);
if ($rs->valid()) {
$pbar = new progress_bar('quizupgradegrades', 500, true);
$i=0;
foreach ($rs as $quiz) {
@@ -613,8 +614,8 @@ function quiz_upgrade_grades() {
quiz_update_grades($quiz, 0, false);
$pbar->update($i, $count, "Updating Quiz grades ($i/$count).");
}
$rs->close();
}
$rs->close();
}
/**