From 1a9528e010bf9bfb805e1d4637ee0d5fddd224ce Mon Sep 17 00:00:00 2001 From: Jason Fowler Date: Wed, 30 Nov 2011 14:36:22 +0800 Subject: [PATCH] MDL-30376 - Glossary - Fixing ability to see the RSS feed for a glossary --- mod/glossary/lib.php | 4 ++-- mod/glossary/rsslib.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php index 89d992ded54..98bc0e6e981 100644 --- a/mod/glossary/lib.php +++ b/mod/glossary/lib.php @@ -2748,7 +2748,7 @@ function glossary_extend_navigation($navigation, $course, $module, $cm) { * @param navigation_node $glossarynode The node to add module settings to */ function glossary_extend_settings_navigation(settings_navigation $settings, navigation_node $glossarynode) { - global $PAGE, $DB, $CFG, $USER; + global $PAGE, $DB, $CFG, $USER, $COURSE; $mode = optional_param('mode', '', PARAM_ALPHA); $hook = optional_param('hook', 'ALL', PARAM_CLEAN); @@ -2771,7 +2771,7 @@ function glossary_extend_settings_navigation(settings_navigation $settings, navi $glossary = $DB->get_record('glossary', array("id" => $PAGE->cm->instance)); - if (!empty($CFG->enablerssfeeds) && !empty($CFG->glossary_enablerssfeeds) && $glossary->rsstype && $glossary->rssarticles) { + if (!empty($CFG->enablerssfeeds) && !empty($CFG->glossary_enablerssfeeds) && $glossary->rsstype && $glossary->rssarticles && can_access_course($COURSE, $USER)) { require_once("$CFG->libdir/rsslib.php"); $string = get_string('rsstype','forum'); diff --git a/mod/glossary/rsslib.php b/mod/glossary/rsslib.php index 3ab155d27cf..d2448abb849 100644 --- a/mod/glossary/rsslib.php +++ b/mod/glossary/rsslib.php @@ -4,7 +4,7 @@ //This function is the main entry point to glossary //rss feeds generation. function glossary_rss_get_feed($context, $args) { - global $CFG, $DB; + global $CFG, $DB, $COURSE, $USER; $status = true; @@ -20,7 +20,7 @@ //context id from db should match the submitted one //no specific capability required to view glossary entries so just check user is enrolled - if ($context->id != $modcontext->id || !is_enrolled($context)) { + if ($context->id != $modcontext->id || !can_access_course($COURSE, $USER)) { return null; } } -- 2.39.2