From 4436a63b643e1abc454b37cbea8f201dfcd0169e Mon Sep 17 00:00:00 2001
From: stronk7 <stronk7>
Date: Fri, 31 Oct 2008 21:50:08 +0000
Subject: [PATCH] MDL-14998 - roles: add mod/forum:viewdiscussion protection to
 forum_get_discussions() ; merged from 19_STABLE

---
 mod/forum/lib.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 9c8198a531..aab45ef6d9 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -2420,9 +2420,13 @@ function forum_get_discussions($cm, $forumsort="d.timemodified DESC", $fullpost=
     $now = round(time(), -2);
     $params = array($cm->instance);
 
-    if (!empty($CFG->forum_enabletimedposts)) {
+    $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
 
-        $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
+    if (!has_capability('mod/forum:viewdiscussion', $modcontext)) { /// User must have perms to view discussions
+        return array();
+    }
+
+    if (!empty($CFG->forum_enabletimedposts)) { /// Users must fulfill timed posts
 
         if (!has_capability('mod/forum:viewhiddentimedposts', $modcontext)) {
             $timelimit = " AND ((d.timestart <= ? AND (d.timeend = 0 OR d.timeend > ?))";
-- 
2.39.5