mirror of
https://github.com/moodle/moodle.git
synced 2025-06-01 21:55:12 +02:00
Merge branch 'MDL-56654-master' of git://github.com/damyon/moodle
This commit is contained in:
commit
246288c3f9
@ -229,10 +229,11 @@ $courseid = (empty($courseid)) ? SITEID : $courseid;
|
||||
|
||||
$blogheaders = blog_get_headers();
|
||||
|
||||
$rsscontext = null;
|
||||
$filtertype = null;
|
||||
$thingid = null;
|
||||
$rsstitle = '';
|
||||
if ($CFG->enablerssfeeds) {
|
||||
$rsscontext = null;
|
||||
$filtertype = null;
|
||||
$thingid = null;
|
||||
list($thingid, $rsscontext, $filtertype) = blog_rss_get_params($blogheaders['filters']);
|
||||
if (empty($rsscontext)) {
|
||||
$rsscontext = context_system::instance();
|
||||
@ -275,6 +276,10 @@ echo $OUTPUT->heading($blogheaders['heading'], 2);
|
||||
$bloglisting = new blog_listing($blogheaders['filters']);
|
||||
$bloglisting->print_entries();
|
||||
|
||||
if ($CFG->enablerssfeeds) {
|
||||
blog_rss_print_link($rsscontext, $filtertype, $thingid, $tagid, get_string('rssfeed', 'blog'));
|
||||
}
|
||||
|
||||
echo $OUTPUT->footer();
|
||||
$eventparams = array(
|
||||
'other' => array('entryid' => $entryid, 'tagid' => $tagid, 'userid' => $userid, 'modid' => $modid, 'groupid' => $groupid,
|
||||
|
@ -83,7 +83,7 @@ function blog_rss_print_link($context, $filtertype, $filterselect = 0, $tagid =
|
||||
|
||||
$url = blog_rss_get_url($context->id, $userid, $filtertype, $filterselect, $tagid);
|
||||
$rsspix = $OUTPUT->pix_url('i/rss');
|
||||
print '<div class="mdl-right"><a href="'. $url .'"><img src="'. $rsspix .'" title="'. strip_tags($tooltiptext) .'" alt="'.get_string('rss').'" /></a></div>';
|
||||
print '<div class="pull-xs-right"><a href="'. $url .'"><img src="'. $rsspix .'" title="'. strip_tags($tooltiptext) .'" alt="'.get_string('rss').'" /></a></div>';
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
x
Reference in New Issue
Block a user