Merge branch 'master_MDL-28410'

This commit is contained in:
Petr Skoda 2011-08-02 15:01:15 +02:00
commit 411b2e1d8d
3 changed files with 3 additions and 7 deletions

View File

@ -31,7 +31,7 @@ $string['displayhorizontal'] = 'Display horizontally';
$string['displaymode'] = 'Display mode';
$string['displayvertical'] = 'Display vertically';
$string['expired'] = 'Sorry, this activity closed on {$a} and is no longer available';
$string['fillinatleastoneoption'] = 'You need to provide at least two possible answers.';
$string['atleastoneoption'] = 'You need to provide at least one possible answer.';
$string['full'] = '(Full)';
$string['havetologin'] = 'You have to log in before you can submit your choice';
$string['choice'] = 'Choice';

View File

@ -127,11 +127,7 @@ class mod_choice_mod_form extends moodleform_mod {
}
if ($choices < 1) {
$errors['option[0]'] = get_string('fillinatleastoneoption', 'choice');
}
if ($choices < 2) {
$errors['option[1]'] = get_string('fillinatleastoneoption', 'choice');
$errors['option[0]'] = get_string('atleastoneoption', 'choice');
}
return $errors;

View File

@ -5,7 +5,7 @@
// This fragment is called by /admin/index.php
////////////////////////////////////////////////////////////////////////////////
$module->version = 2010101300;
$module->version = 2010101301;
$module->requires = 2010080300; // Requires this Moodle version
$module->cron = 0;