Index: lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/forum/lib.php,v
retrieving revision 1.609.2.63
diff -c -w -r1.609.2.63 lib.php
*** lib.php     10 Jul 2008 09:48:46 -0000      1.609.2.63
--- lib.php     3 Sep 2008 09:51:44 -0000
***************
*** 1678,1684 ****
              $select[] = "(d.userid = {$USER->id} OR (d.timestart < $now AND (d.timeend = 0 OR d.timeend > $now)))";
          }

!         if ($forum->type == 'qanda') {
              if (!empty($forum->onlydiscussions)) {
                  $discussionsids = implode(',', $forum->onlydiscussions);
                  $select[] = "(d.id IN ($discussionsids) OR p.parent = 0)";
--- 1678,1688 ----
              $select[] = "(d.userid = {$USER->id} OR (d.timestart < $now AND (d.timeend = 0 OR d.timeend > $now)))";
          }

!       $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)) {
                  $discussionsids = implode(',', $forum->onlydiscussions);
                  $select[] = "(d.id IN ($discussionsids) OR p.parent = 0)";