Merge branch 'master_MDL-28410'

moodle · Aug 2, 2011 · 411b2e1 · 411b2e1
2 parents 74b0ad6 + aa20227
commit 411b2e1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/mod/choice/lang/en/choice.php b/mod/choice/lang/en/choice.php
@@ -31,7 +31,7 @@
 $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';

diff --git a/mod/choice/mod_form.php b/mod/choice/mod_form.php
@@ -127,11 +127,7 @@ function validation($data, $files) {
         }
 
         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;

diff --git a/mod/choice/version.php b/mod/choice/version.php
@@ -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;