mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master_MDL-28017' of git://github.com/danmarsden/moodle

Browse Source 
Conflicts:
	mod/scorm/version.php
This commit is contained in:
Eloy Lafuente (stronk7) 2011-07-12 16:28:36 +02:00
commit dd8f2538b6
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -542,6 +542,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;
}

1
mod/scorm/lang/en/scorm.php
View File

@ -278,7 +278,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.';

2
mod/scorm/settings.php
View File

@ -117,8 +117,6 @@ if ($ADMIN->fulltree) {
//admin level settings.
$settings->add(new admin_setting_heading('scorm/adminsettings', get_string('adminsettings', 'scorm'), ''));
$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));

2
mod/scorm/version.php
View File

@ -23,7 +23,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
$module->version = 2011021401; // 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)?