Fix for MDL-12979 forum sends out notification to users not in course - due to call...

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index ef155954b344411f51bb7449a1e7b8cb7d091a3a..6f5df3caaba118e8d6530c9ffb7e30d23a2556e4 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -1918,7 +1918,11 @@ function forum_subscribed_users($course, $forum, $groupid=0, $cache=false) {
     }
 
     if (forum_is_forcesubscribed($forum)) {
-        $results = get_course_users($course->id);     // Otherwise get everyone in the course
+        $context = get_context_instance(CONTEXT_COURSE, $course->id);
+        $sort = "u.email ASC";
+        $fields ="u.id, u.username, u.firstname, u.lastname, u.maildisplay, u.mailformat, u.maildigest, u.emailstop, u.imagealt,
+                  u.email, u.city, u.country, u.lastaccess, u.lastlogin, u.picture, u.timezone, u.theme, u.lang, u.trackforums, u.mnethostid";
+        $results = get_users_by_capability($context, 'mod/forum:initialsubscriptions', $fields, $sort, '','','','', false, true);
     } else {
         $results = get_records_sql("SELECT u.id, u.username, u.firstname, u.lastname, u.maildisplay, u.mailformat, u.maildigest, u.emailstop, u.imagealt,
                                    u.email, u.city, u.country, u.lastaccess, u.lastlogin, u.picture, u.timezone, u.theme, u.lang, u.trackforums, u.mnethostid