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

Merge branch 'MDL-25708' of git://github.com/stronk7/moodle

Browse source
This commit is contained in:
Petr Skoda 2011-01-31 14:21:53 +01:00
commit 8afc38bd39
53 changed files with 514 additions and 526 deletions
Download patch file Download diff file Expand all files Collapse all files

5
mod/scorm/db/upgrade.php
View file

@ -140,7 +140,8 @@ function xmldb_scorm_upgrade($oldversion) {
$count = $DB->count_records_sql("SELECT COUNT('x') $sqlfrom");
if ($rs = $DB->get_recordset_sql("SELECT s.id, s.scormtype, s.reference, s.course, cm.id AS cmid $sqlfrom ORDER BY s.course, s.id")) {
$rs = $DB->get_recordset_sql("SELECT s.id, s.scormtype, s.reference, s.course, cm.id AS cmid $sqlfrom ORDER BY s.course, s.id");
if ($rs->valid()) {
$pbar = new progress_bar('migratescormfiles', 500, true);
@ -213,8 +214,8 @@ function xmldb_scorm_upgrade($oldversion) {
@rmdir("$CFG->dataroot/$scorm->course/$CFG->moddata/scorm/");
@rmdir("$CFG->dataroot/$scorm->course/$CFG->moddata/");
}
$rs->close();
}
$rs->close();
/// scorm savepoint reached
upgrade_mod_savepoint(true, 2008090304, 'scorm');

5
mod/scorm/lib.php
View file

@ -575,7 +575,8 @@ function scorm_upgrade_grades() {
$sql = "SELECT s.*, cm.idnumber AS cmidnumber, s.course AS courseid
FROM {scorm} s, {course_modules} cm, {modules} m
WHERE m.name='scorm' AND m.id=cm.module AND cm.instance=s.id";
if ($rs = $DB->get_recordset_sql($sql)) {
$rs = $DB->get_recordset_sql($sql);
if ($rs->valid()) {
$pbar = new progress_bar('scormupgradegrades', 500, true);
$i=0;
foreach ($rs as $scorm) {
@ -584,8 +585,8 @@ function scorm_upgrade_grades() {
scorm_update_grades($scorm, 0, false);
$pbar->update($i, $count, "Updating Scorm grades ($i/$count).");
}
$rs->close();
}
$rs->close();
}
/**