mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-20 16:04:25 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-70621-master' of git://github.com/lucaboesch/moodle

Browse Source
This commit is contained in:
Sara Arjona 2021-02-03 09:02:45 +01:00
commit a50802c68b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/forum/mod_form.php
View File

@ -133,7 +133,7 @@ class mod_forum_mod_form extends moodleform_mod {
$choices[0] = get_string('none');
$choices[1] = get_string('discussions', 'forum');
$choices[2] = get_string('posts', 'forum');
$mform->addElement('select', 'rsstype', get_string('rsstype'), $choices);
$mform->addElement('select', 'rsstype', get_string('rsstype', 'forum'), $choices);
$mform->addHelpButton('rsstype', 'rsstype', 'forum');
if (isset($CFG->forum_rsstype)) {
$mform->setDefault('rsstype', $CFG->forum_rsstype);

2
mod/glossary/lib.php
View File

@ -3191,7 +3191,7 @@ function glossary_extend_settings_navigation(settings_navigation $settings, navi
if (!empty($CFG->enablerssfeeds) && !empty($CFG->glossary_enablerssfeeds) && $glossary->rsstype && $glossary->rssarticles && has_capability('mod/glossary:view', $PAGE->cm->context)) {
require_once("$CFG->libdir/rsslib.php");
$string = get_string('rsstype','forum');
$string = get_string('rsstype', 'glossary');
$url = new moodle_url(rss_get_url($PAGE->cm->context->id, $USER->id, 'mod_glossary', $glossary->id));
$glossarynode->add($string, $url, settings_navigation::TYPE_SETTING, null, null, new pix_icon('i/rss', ''));

2
mod/glossary/mod_form.php
View File

@ -111,7 +111,7 @@ class mod_glossary_mod_form extends moodleform_mod {
$choices[0] = get_string('none');
$choices[1] = get_string('withauthor', 'glossary');
$choices[2] = get_string('withoutauthor', 'glossary');
$mform->addElement('select', 'rsstype', get_string('rsstype'), $choices);
$mform->addElement('select', 'rsstype', get_string('rsstype', 'glossary'), $choices);
$mform->addHelpButton('rsstype', 'rsstype', 'glossary');
$choices = array();