Merge branch 'wip-MDL-30541-stable22' of git://github.com/phalacee/moodle into MOODLE_22_STABLE

2011-12-21 14:16:55 +08:00
parent dbfa519ad9 332748dd7e
commit 8fe13ecf1a
1 changed files with 6 additions and 2 deletions
@@ -212,9 +212,13 @@ if (empty($entryid) && empty($modid) && empty($groupid)) {
 }

 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