Merge branch 'm21_MDL-28017' of git://github.com/danmarsden/moodle in…

…to MOODLE_21_STABLE
moodle · Jul 12, 2011 · 6f09ed8 · 6f09ed8
2 parents e0dfb65 + 15bec9a
commit 6f09ed8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git 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/lang/en/scorm.php b/mod/scorm/lang/en/scorm.php
@@ -271,7 +271,6 @@
 $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
@@ -50,8 +50,6 @@
 
     $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));

diff --git 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)?