Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'MDL-30166-m24' of git://github.com/ankitagarwal/moodle …

…into MOODLE_24_STABLE
  • Loading branch information...
commit ddaf467f311ba36e68f6a993a335f9bb60eb3d9b 2 parents b3a5ae0 + 13bb9ce
@stronk7 stronk7 authored
View
2  lang/en/moodle.php
@@ -1251,7 +1251,7 @@
$string['outline'] = 'Outline';
$string['outlinereport'] = 'Outline report';
$string['page'] = 'Page';
-$string['pageheaderconfigablock'] = 'Configuring a block in %fullname%';
+$string['pageheaderconfigablock'] = 'Configuring a block in {$a->fullname}';
$string['pagepath'] = 'Page path';
$string['pageshouldredirect'] = 'This page should automatically redirect. If nothing is happening please use the continue link below.';
$string['parentcategory'] = 'Parent category';
View
4 mod/data/edit.php
@@ -121,9 +121,9 @@
/// RSS and CSS and JS meta
if (!empty($CFG->enablerssfeeds) && !empty($CFG->data_enablerssfeeds) && $data->rssarticles > 0) {
- $rsspath = rss_get_url($context->id, $USER->id, 'mod_data', $data->id);
$courseshortname = format_string($course->shortname, true, array('context' => context_course::instance($course->id)));
- $PAGE->add_alternate_version($courseshortname . ': %fullname%', $rsspath, 'application/rss+xml');
+ $rsstitle = $courseshortname . ': ' . format_string($data->name);
+ rss_add_http_header($context, 'mod_data', $data, $rsstitle);
}
if ($data->csstemplate) {
$PAGE->requires->css('/mod/data/css.php?d='.$data->id);
View
2  mod/data/view.php
@@ -280,7 +280,7 @@
/// RSS and CSS and JS meta
$meta = '';
if (!empty($CFG->enablerssfeeds) && !empty($CFG->data_enablerssfeeds) && $data->rssarticles > 0) {
- $rsstitle = $courseshortname . ': %fullname%';
+ $rsstitle = $courseshortname . ': ' . format_string($data->name);
rss_add_http_header($context, 'mod_data', $data, $rsstitle);
}
if ($data->csstemplate) {
View
2  mod/forum/discuss.php
@@ -55,7 +55,7 @@
if (!empty($CFG->enablerssfeeds) && !empty($CFG->forum_enablerssfeeds) && $forum->rsstype && $forum->rssarticles) {
require_once("$CFG->libdir/rsslib.php");
- $rsstitle = format_string($course->shortname, true, array('context' => context_course::instance($course->id))) . ': %fullname%';
+ $rsstitle = format_string($course->shortname, true, array('context' => context_course::instance($course->id))) . ': ' . format_string($forum->name);
rss_add_http_header($modcontext, 'mod_forum', $forum, $rsstitle);
}
View
2  mod/forum/view.php
@@ -96,7 +96,7 @@
if (!empty($CFG->enablerssfeeds) && !empty($CFG->forum_enablerssfeeds) && $forum->rsstype && $forum->rssarticles) {
require_once("$CFG->libdir/rsslib.php");
- $rsstitle = format_string($course->shortname, true, array('context' => context_course::instance($course->id))) . ': %fullname%';
+ $rsstitle = format_string($course->shortname, true, array('context' => context_course::instance($course->id))) . ': ' . format_string($forum->name);
rss_add_http_header($context, 'mod_forum', $forum, $rsstitle);
}
View
2  mod/glossary/view.php
@@ -251,7 +251,7 @@
if (!empty($CFG->enablerssfeeds) && !empty($CFG->glossary_enablerssfeeds)
&& $glossary->rsstype && $glossary->rssarticles) {
- $rsstitle = format_string($course->shortname, true, array('context' => context_course::instance($course->id))) . ': %fullname%';
+ $rsstitle = format_string($course->shortname, true, array('context' => context_course::instance($course->id))) . ': '. format_string($glossary->name);
rss_add_http_header($context, 'mod_glossary', $glossary, $rsstitle);
}
Please sign in to comment.
Something went wrong with that request. Please try again.