MDL-13681 fixed forum search; merged from MOODLE_19_STABLE

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 534edfd9b20a18767e9c8df68fba2302d7a02fc3..3f01ace3bae5b2901f73b8693af79bdfa4cb292c 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -4052,10 +4052,11 @@ function forum_user_can_see_post($forum, $discussion, $post, $user=NULL, $cm=NUL
 
     if ($forum->type == 'qanda') {
         $firstpost = forum_get_firstpost_from_discussion($discussion->id);
+        $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
 
         return (forum_user_has_posted($forum->id,$discussion->id,$user->id) ||
                 $firstpost->id == $post->id ||
-                has_capability('mod/forum:viewqandawithoutposting', $modcontext, false, $user->id));
+                has_capability('mod/forum:viewqandawithoutposting', $modcontext, $user->id, false));
     }
     return true;
 }