L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-85253-main' of https://github.com/laurentdavid/moodle

Browse Source
This commit is contained in:
Amaia Anabitarte
2025-05-14 21:35:54 +07:00
committed by Huong Nguyen
parent 7aa47bbf6a 05cd7ca936
commit fc404a1360
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/modedit.php
+1 -1
View File
@@ -127,7 +127,7 @@ if (!empty($add)) {
$sectionname = get_section_name($course, $cw);
$fullmodulename = get_string('modulename', $module->name);
$pageheading = get_string('editsettings', 'moodle');
$pagetitle = get_string('edita', 'moodle', $fullmodulename) . ': ' . $cm->name;
$pagetitle = get_string('edita', 'moodle', $fullmodulename) . moodle_page::TITLE_SEPARATOR . $cm->name;
$navbaraddition = null;
} else {
mod/data/edit.php
+1 -1
View File
@@ -99,7 +99,7 @@ if (!has_capability('mod/data:manageentries', $context)) {
// RSS and CSS and JS meta.
if (!empty($CFG->enablerssfeeds) && !empty($CFG->data_enablerssfeeds) && $data->rssarticles > 0) {
$courseshortname = format_string($course->shortname, true, array('context' => context_course::instance($course->id)));
$rsstitle = $courseshortname . ': ' . format_string($data->name);
$rsstitle = $courseshortname . \moodle_page::TITLE_SEPARATOR . format_string($data->name);
rss_add_http_header($context, 'mod_data', $data, $rsstitle);
}
if ($data->csstemplate) {
mod/data/rsslib.php
+6 -3
View File
@@ -119,9 +119,12 @@ defined('MOODLE_INTERNAL') || die();
$courseshortname = format_string($course->shortname, true, array('context' => $coursecontext));
// First all rss feeds common headers.
$header = rss_standard_header($courseshortname . ': ' . format_string($data->name, true, array('context' => $context)),
$CFG->wwwroot."/mod/data/view.php?d=".$data->id,
format_text($data->intro, $data->introformat, array('context' => $context)));
$header = rss_standard_header($courseshortname
. \moodle_page::TITLE_SEPARATOR
. format_string($data->name, true, ['context' => $context]),
$CFG->wwwroot . "/mod/data/view.php?d=" . $data->id,
format_text($data->intro, $data->introformat, ['context' => $context])
);
if (!empty($header)) {
$articles = rss_add_items($items);
mod/data/view.php
+1 -1
View File
@@ -194,7 +194,7 @@ $courseshortname = format_string($course->shortname, true, array('context' => co
/// RSS and CSS and JS meta
$meta = '';
if (!empty($CFG->enablerssfeeds) && !empty($CFG->data_enablerssfeeds) && $data->rssarticles > 0) {
$rsstitle = $courseshortname . ': ' . format_string($data->name);
$rsstitle = $courseshortname . \moodle_page::TITLE_SEPARATOR . format_string($data->name);
rss_add_http_header($context, 'mod_data', $data, $rsstitle);
}
if ($data->csstemplate) {