Merge branch 'MDL-38005-master' of git://github.com/FMCorz/moodle

This commit is contained in:
Damyon Wiese 2013-03-18 13:45:41 +08:00
commit 7c211f565a
17 changed files with 34 additions and 26 deletions

View file

@ -103,7 +103,7 @@ class mod_glossary_mod_form extends moodleform_mod {
if ($CFG->enablerssfeeds && isset($CFG->glossary_enablerssfeeds) && $CFG->glossary_enablerssfeeds) {
//-------------------------------------------------------------------------------
$mform->addElement('header', '', get_string('rss'));
$mform->addElement('header', 'rssheader', get_string('rss'));
$choices = array();
$choices[0] = get_string('none');
$choices[1] = get_string('withauthor', 'glossary');