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

Merge branch 'master_MDL-39910' of https://github.com/danmarsden/moodle

Browse Source 
Conflicts:
	mod/scorm/db/upgrade.php
This commit is contained in:
Sam Hemelryk
2013-09-27 11:32:05 +12:00
parent 18784adb12 8d29a8c3bc
commit 322d9c8cda
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/scorm/db/upgrade.php
+8 -6
View File
@@ -130,6 +130,7 @@ function xmldb_scorm_upgrade($oldversion) {
}
if ($oldversion < 2013090100) {
global $CFG;
$table = new xmldb_table('scorm');
$field = new xmldb_field('nav', XMLDB_TYPE_INTEGER, '1', XMLDB_UNSIGNED, true, null, 1, 'hidetoc');
@@ -160,15 +161,16 @@ function xmldb_scorm_upgrade($oldversion) {
$dbman->drop_field($table, $field);
}
$hide = get_config('hidenav', 'scorm');
unset_config('hidenav', 'mod_scorm');
$hide = get_config('scorm', 'hidenav');
unset_config('hidenav', 'scorm');
if (!empty($hide)) {
set_config('nav', SCORM_NAV_DISABLED, 'mod_scorm');
require_once($CFG->dirroot . '/mod/scorm/lib.php');
set_config('nav', SCORM_NAV_DISABLED, 'scorm');
}
$hideadv = get_config('hidenav_adv', 'scorm');
unset_config('hidenav_adv', 'mod_scorm');
set_config('nav_adv', $hideadv, 'mod_scorm');
$hideadv = get_config('scorm', 'hidenav_adv');
unset_config('hidenav_adv', 'scorm');
set_config('nav_adv', $hideadv, 'scorm');
upgrade_mod_savepoint(true, 2013090100, 'scorm');
}