Merge branch 'MDL-42930-master' of git://github.com/damyon/moodle

Conflicts:
	mod/scorm/db/upgrade.php
This commit is contained in:
Dan Poltawski 2013-11-18 14:32:55 +08:00
commit 728f924ec1
80 changed files with 240 additions and 0 deletions

View file

@ -175,6 +175,9 @@ function xmldb_scorm_upgrade($oldversion) {
upgrade_mod_savepoint(true, 2013090100, 'scorm');
}
// Moodle v2.6.0 release upgrade line.
// Put any upgrade step following this.
if ($oldversion < 2013110501) {
// Fix invalid $scorm->launch records.
// Get all scorms that have a launch value that references a sco from a different scorm.