moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-11 11:56:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-68893-310' of git://github.com/lucaboesch/moodle into MOODLE_310_STABLE

Browse source
This commit is contained in:
Andrew Nicols 2021-02-03 09:41:09 +08:00
commit 82e32d8012
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mod/data/lang/en/data.php
View file

@ -357,6 +357,7 @@ $string['rows'] = 'rows';
$string['rssglobaldisabled'] = 'Disabled. See site configuration variables.'; $string['rssglobaldisabled'] = 'Disabled. See site configuration variables.';
$string['rsstemplate'] = 'RSS template'; $string['rsstemplate'] = 'RSS template';
$string['rsstitletemplate'] = 'RSS title template'; $string['rsstitletemplate'] = 'RSS title template';
$string['rsstype'] = 'RSS feed for this activity';
$string['save'] = 'Save'; $string['save'] = 'Save';
$string['saveandadd'] = 'Save and add another'; $string['saveandadd'] = 'Save and add another';
$string['saveandview'] = 'Save and view'; $string['saveandview'] = 'Save and view';

2
mod/data/lib.php
View file

@ -3635,7 +3635,7 @@ function data_extend_settings_navigation(settings_navigation $settings, navigati
if (!empty($CFG->enablerssfeeds) && !empty($CFG->data_enablerssfeeds) && $data->rssarticles > 0) { if (!empty($CFG->enablerssfeeds) && !empty($CFG->data_enablerssfeeds) && $data->rssarticles > 0) {
require_once("$CFG->libdir/rsslib.php"); require_once("$CFG->libdir/rsslib.php");
$string = get_string('rsstype','forum'); $string = get_string('rsstype', 'data');
$url = new moodle_url(rss_get_url($PAGE->cm->context->id, $USER->id, 'mod_data', $data->id)); $url = new moodle_url(rss_get_url($PAGE->cm->context->id, $USER->id, 'mod_data', $data->id));
$datanode->add($string, $url, settings_navigation::TYPE_SETTING, null, null, new pix_icon('i/rss', '')); $datanode->add($string, $url, settings_navigation::TYPE_SETTING, null, null, new pix_icon('i/rss', ''));