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

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

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2013-03-13 01:08:26 +01:00
commit 0e5781a7ff
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lang/en/moodle.php
View file

@ -1250,7 +1250,7 @@ $string['other'] = 'Other';
$string['outline'] = 'Outline'; $string['outline'] = 'Outline';
$string['outlinereport'] = 'Outline report'; $string['outlinereport'] = 'Outline report';
$string['page'] = 'Page'; $string['page'] = 'Page';
$string['pageheaderconfigablock'] = 'Configuring a block in %fullname%'; $string['pageheaderconfigablock'] = 'Configuring a block in {$a->fullname}';
$string['pagepath'] = 'Page path'; $string['pagepath'] = 'Page path';
$string['pageshouldredirect'] = 'This page should automatically redirect. If nothing is happening please use the continue link below.'; $string['pageshouldredirect'] = 'This page should automatically redirect. If nothing is happening please use the continue link below.';
$string['parentcategory'] = 'Parent category'; $string['parentcategory'] = 'Parent category';

4
mod/data/edit.php
View file

@ -122,9 +122,9 @@ if ($cancel) {
/// RSS and CSS and JS meta /// RSS and CSS and JS meta
if (!empty($CFG->enablerssfeeds) && !empty($CFG->data_enablerssfeeds) && $data->rssarticles > 0) { 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))); $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) { if ($data->csstemplate) {
$PAGE->requires->css('/mod/data/css.php?d='.$data->id); $PAGE->requires->css('/mod/data/css.php?d='.$data->id);

2
mod/data/view.php
View file

@ -280,7 +280,7 @@
/// RSS and CSS and JS meta /// RSS and CSS and JS meta
$meta = ''; $meta = '';
if (!empty($CFG->enablerssfeeds) && !empty($CFG->data_enablerssfeeds) && $data->rssarticles > 0) { 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); rss_add_http_header($context, 'mod_data', $data, $rsstitle);
} }
if ($data->csstemplate) { if ($data->csstemplate) {

2
mod/forum/discuss.php
View file

@ -55,7 +55,7 @@
if (!empty($CFG->enablerssfeeds) && !empty($CFG->forum_enablerssfeeds) && $forum->rsstype && $forum->rssarticles) { if (!empty($CFG->enablerssfeeds) && !empty($CFG->forum_enablerssfeeds) && $forum->rsstype && $forum->rssarticles) {
require_once("$CFG->libdir/rsslib.php"); 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); rss_add_http_header($modcontext, 'mod_forum', $forum, $rsstitle);
} }

2
mod/forum/view.php
View file

@ -96,7 +96,7 @@
if (!empty($CFG->enablerssfeeds) && !empty($CFG->forum_enablerssfeeds) && $forum->rsstype && $forum->rssarticles) { if (!empty($CFG->enablerssfeeds) && !empty($CFG->forum_enablerssfeeds) && $forum->rsstype && $forum->rssarticles) {
require_once("$CFG->libdir/rsslib.php"); 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); rss_add_http_header($context, 'mod_forum', $forum, $rsstitle);
} }

2
mod/glossary/view.php
View file

@ -251,7 +251,7 @@ $PAGE->set_url($url);
if (!empty($CFG->enablerssfeeds) && !empty($CFG->glossary_enablerssfeeds) if (!empty($CFG->enablerssfeeds) && !empty($CFG->glossary_enablerssfeeds)
&& $glossary->rsstype && $glossary->rssarticles) { && $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); rss_add_http_header($context, 'mod_glossary', $glossary, $rsstitle);
} }