Merge branch 'MDL-56654-master' of git://github.com/damyon/moodle

crazyserver · Nov 4, 2016 · 246288c · 246288c
2 parents 1e1e4ff + 5ae35b9
commit 246288c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/blog/index.php b/blog/index.php
@@ -229,10 +229,11 @@
 
 $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 @@
 $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,

diff --git a/blog/rsslib.php b/blog/rsslib.php
@@ -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>';
 }
 
 /**