"FORUM/MDL-15968, respect mod/forum:viewqandawithoutposting in forum_search_posts...

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 7225bdea02f703cb99255efc341c459c849d21a6..7ec549903ca2d791204ac608faae9ce584ea8b13 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -1873,7 +1873,11 @@ function forum_search_posts($searchterms, $courseid=0, $limitfrom=0, $limitnum=5
             $params = array('userid'=>$USER->id, 'timestart'=>$now, 'timeend'=>$now);
         }
 
-        if ($forum->type == 'qanda') {
+        $cm = get_coursemodule_from_instance('forum', $forumid);
+        $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+
+        if ($forum->type == 'qanda'
+            && !has_capability('mod/forum:viewqandawithoutposting', $context)) {
             if (!empty($forum->onlydiscussions)) {
                 list($discussionid_sql, $discussionid_params) = $DB->get_in_or_equal($forum->onlydiscussions, SQL_PARAMS_NAMED, 'qanda0');
                 $params = array_merge($params, $discussionid_params);