Merge branch 'wip-MDL-30541-stable22' of git://github.com/phalacee/mo…

…odle into MOODLE_22_STABLE
moodle · Dec 21, 2011 · 8fe13ec · 8fe13ec
2 parents dbfa519 + 332748d
commit 8fe13ec
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/blog/index.php b/blog/index.php
@@ -212,9 +212,13 @@
 }
 
 if ($CFG->enablerssfeeds) {
-    $rsscontext = $filtertype = $thingid = null;
+    $rsscontext = null;
+    $filtertype = null;
+    $thingid = null;
     list($thingid, $rsscontext, $filtertype) = blog_rss_get_params($blogheaders['filters']);
-
+    if (empty($rsscontext)) {
+        $rsscontext = get_system_context();
+    }
     $rsstitle = $blogheaders['heading'];
 
     //check we haven't started output by outputting an error message