Merged from 1.7.

diff --git a/mod/forum/user.php b/mod/forum/user.php
index 9391a1f983da0a78461c1668a1112bb60317f939..d33216246fa7af5b54df2f8045412e2580c882a7 100644 (file)
--- a/mod/forum/user.php
+++ b/mod/forum/user.php
@@ -67,10 +67,13 @@
     
     echo '<div class="user-content">';
     
-    
     if ($course->id == SITEID) {
-        // Search throughout the whole site.
-        $searchcourse = 0;
+        if (!empty($CFG->forceloginforprofiles) || isloggedin()) {
+            // Search throughout the whole site.
+            $searchcourse = 0;
+        } else {
+            $searchcourse = SITEID;
+        }
     } else {
         // Search only for posts the user made in this course.
         $searchcourse = $course->id;