From 66c36644d3deac2b4bc5502f821b9cd6850f02ce Mon Sep 17 00:00:00 2001 From: Dan Marsden Date: Mon, 11 Jul 2011 15:42:53 +1200 Subject: [PATCH 1/2] MDL-28017 SCORM - remove admin setting incorrectly added as it was never used. --- mod/scorm/lang/en/scorm.php | 1 - mod/scorm/settings.php | 2 -- 2 files changed, 3 deletions(-) diff --git a/mod/scorm/lang/en/scorm.php b/mod/scorm/lang/en/scorm.php index 68285fc0a6e..79bc6426bb3 100644 --- a/mod/scorm/lang/en/scorm.php +++ b/mod/scorm/lang/en/scorm.php @@ -271,7 +271,6 @@ $string['typelocalsync'] = 'Downloaded package'; $string['unziperror'] = 'An error occurs during package unzip'; $string['updatefreq'] = 'Auto-update frequency'; $string['updatefreqdesc'] = 'This preference sets the default auto-update frequency of an activity'; -$string['updatetime'] = 'Synchronisation time'; $string['validateascorm'] = 'Validate a package'; $string['validation'] = 'Validation result'; $string['validationtype'] = 'This preference set the DOMXML library used for validating SCORM Manifest. If you don\'t know leave the selected choice.'; diff --git a/mod/scorm/settings.php b/mod/scorm/settings.php index 861b0fb4676..43eb476a92b 100644 --- a/mod/scorm/settings.php +++ b/mod/scorm/settings.php @@ -50,8 +50,6 @@ if ($ADMIN->fulltree) { $settings->add(new admin_setting_configselect('scorm/updatefreq', get_string('updatefreq', 'scorm'), get_string('updatefreqdesc', 'scorm'), 0, scorm_get_updatefreq_array())); - $settings->add(new admin_setting_configtext('scorm/updatetime', get_string('updatetime', 'scorm'), '', 2, PARAM_INT)); - $settings->add(new admin_setting_configcheckbox('scorm/allowtypeexternal', get_string('allowtypeexternal', 'scorm'), '', 0)); $settings->add(new admin_setting_configcheckbox('scorm/allowtypelocalsync', get_string('allowtypelocalsync', 'scorm'), '', 0)); From 15bec9a3658961308b312eedb1c37e15809736ab Mon Sep 17 00:00:00 2001 From: Dan Marsden Date: Tue, 12 Jul 2011 09:48:28 +1200 Subject: [PATCH 2/2] MDL-28017 SCORM add unset_config for old config var --- mod/scorm/db/upgrade.php | 5 +++++ mod/scorm/version.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mod/scorm/db/upgrade.php b/mod/scorm/db/upgrade.php index 84d51f2cc32..049f9931c8c 100644 --- a/mod/scorm/db/upgrade.php +++ b/mod/scorm/db/upgrade.php @@ -538,6 +538,11 @@ function xmldb_scorm_upgrade($oldversion) { // Moodle v2.1.0 release upgrade line // Put any upgrade step following this + if ($oldversion < 2011021402) { + unset_config('updatetime', 'scorm'); + upgrade_mod_savepoint(true, 2011021402, 'scorm'); + } + return true; } diff --git a/mod/scorm/version.php b/mod/scorm/version.php index 3a92877cac3..c44cdc32ac4 100644 --- a/mod/scorm/version.php +++ b/mod/scorm/version.php @@ -6,7 +6,7 @@ ///////////////////////////////////////////////////////////////////////////////// -$module->version = 2011021400; // The (date) version of this module +$module->version = 2011021402; // The (date) version of this module $module->requires = 2010080300; // The version of Moodle that is required $module->cron = 300; // How often should cron check this module (seconds)?