From: vyshane <vyshane>
Date: Tue, 13 Feb 2007 02:28:26 +0000 (+0000)
Subject: Merged from 1.7.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=6155150c02de859fea6e0564ccc7ff448fcb78fd;p=moodle.git

Merged from 1.7.
---

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index d3ee4bae6d..fd09923c8b 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -1116,7 +1116,11 @@ function forum_get_readable_forums($userid, $courseid=0) {
     if ($courseid) {
         $courses = get_records('course', 'id', $courseid);
     } else {
-        $courses = get_records('course');
+        /// If no course is specified, then the user can see SITE + his courses. 
+        /// And admins can see all courses, so pass the $doanything flag enabled
+        $courses1 = get_records('course', 'id', SITEID);
+        $courses2 = get_my_courses($userid, '', '*', true);
+        $courses = array_merge($courses1, $courses2);
     }
     if (!$courses) {
         return false;