MDL-14270 fixed regressions - fatal error in forum code; merged from MOODLE_19_STABLE

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index b1b2e077c176bea548ef15464199db42f2d4da24..26bf8782c620a933dc702e1797f3c0e0ed997c66 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -2080,7 +2080,7 @@ function forum_count_discussions($forum, $cm, $course) {
         return $cache[$course->id][$forum->id];
     }
 
-    if (has_capability('moodle/site:accessallgroups', get_context_instance(CONTEXT_MODULE, $cm))) {
+    if (has_capability('moodle/site:accessallgroups', get_context_instance(CONTEXT_MODULE, $cm->id))) {
         return $cache[$course->id][$forum->id];
     }
 
@@ -5806,7 +5806,7 @@ function forum_tp_count_forum_unread_posts($cm, $course) {
         return $readcache[$course->id][$forumid];
     }
 
-    if (has_capability('moodle/site:accessallgroups', get_context_instance(CONTEXT_MODULE, $cm))) {
+    if (has_capability('moodle/site:accessallgroups', get_context_instance(CONTEXT_MODULE, $cm->id))) {
         return $readcache[$course->id][$forumid];
     }