mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-08 09:02:07 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'w04_MDL-31081_m23_forumindex' of git://github.com/skodak/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2012-01-23 21:17:54 +01:00
commit dee8d39f4d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mod/forum/lib.php
View File

@ -4543,9 +4543,10 @@ function forum_get_subscribed_forums($course) {
$sql = "SELECT f.id
FROM {forum} f
LEFT JOIN {forum_subscriptions} fs ON (fs.forum = f.id AND fs.userid = ?)
WHERE f.forcesubscribe <> ".FORUM_DISALLOWSUBSCRIBE."
WHERE f.course = ?
AND f.forcesubscribe <> ".FORUM_DISALLOWSUBSCRIBE."
AND (f.forcesubscribe = ".FORUM_FORCESUBSCRIBE." OR fs.id IS NOT NULL)";
if ($subscribed = $DB->get_records_sql($sql, array($USER->id))) {
if ($subscribed = $DB->get_records_sql($sql, array($USER->id, $course->id))) {
foreach ($subscribed as $s) {
$subscribed[$s->id] = $s->id;
}