Browse files

Merge branch 'w19_MDL-31691_m20_cohortidnumber' of git://github.com/s…

…kodak/moodle into MOODLE_20_STABLE
  • Loading branch information...
2 parents d4359be + eb9d996 commit 7f8e21310bb5ce0d2fae54aad55f938468d2fc2c @danpoltawski danpoltawski committed May 8, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 cohort/edit_form.php
  2. +1 −1 cohort/index.php
View
2 cohort/edit_form.php
@@ -49,7 +49,7 @@ public function definition() {
$mform->addElement('select', 'contextid', get_string('context', 'role'), $options);
$mform->addElement('text', 'idnumber', get_string('idnumber', 'cohort'), 'maxlength="254" size="50"');
- $mform->setType('name', PARAM_RAW);
+ $mform->setType('name', PARAM_RAW); // idnumbers are plain text, must not be changed
$mform->addElement('editor', 'description_editor', get_string('description', 'cohort'), null, $editoroptions);
$mform->setType('description_editor', PARAM_RAW);
View
2 cohort/index.php
@@ -75,7 +75,7 @@
foreach($cohorts as $cohort) {
$line = array();
$line[] = format_string($cohort->name);
- $line[] = $cohort->idnumber;
+ $line[] = s($cohort->idnumber); // plain text
$line[] = format_text($cohort->description, $cohort->descriptionformat);
$line[] = $DB->count_records('cohort_members', array('cohortid'=>$cohort->id));

0 comments on commit 7f8e213

Please sign in to comment.